Merge pull request #37 from h8h/new-data-structure

Abfrage der nominatim um Öffnungszeiten dem Land und dem Bundesland anzupassen #35

README.md

@@ -1,5 +1,5 @@
-# Farmshops Map / Hofladen Karte
-Data viewer for farmshops, milk and food vending machines and other direct marketers on openstreetmap.
+# Farmshops Map / Direktvermarkter Karte
+Data viewer for  markets, farmshops, milk and food vending machines and other direct marketers on openstreetmap.
 
 Using:
 - [leaflet.js](https://github.com/Leaflet/Leaflet)
@@ -10,13 +10,14 @@ Using:
 - [leaflet sidebar v2](https://github.com/Turbo87/sidebar-v2)
 - [leaflet locatecontrol](https://github.com/domoritz/leaflet-locatecontrol)
 - [opening_hours.js](https://github.com/opening-hours/opening_hours.js)
+- [The noun Project Icons](https://thenounproject.com/)
 
 Planned for future versions:
-- [tags2names](https://github.com/ENT8R/tags2names)
+- [tags2names](https://github.com/ENT8R/tags2names) for internationalisation
 
 ## Documentation in German
 
-Übersichtskarte von Hofläden, Milchautomaten und anderen Direktvermarktern aus der Region. Die Karte erhält alle ihre Daten von OpenstreetMap, bereitet sie optisch auf und unterstützt die Pflege der Daten indem sie fehlende Werte sichtbar macht und direkt auf den entsprechenden Ort auf OSM zurück verlinkt.
+Übersichtskarte von Hofläden, Milchautomaten und anderen Direktvermarktern aus der DACH-Region (Deutschland, Österreich, Schweiz). Die Karte erhält alle ihre Daten von OpenstreetMap, bereitet sie optisch auf und unterstützt die Pflege der Daten indem sie fehlende Werte sichtbar macht und direkt auf den entsprechenden Ort auf OSM zurück verlinkt.
 
 Webseite: https://codeforkarlsruhe.github.io/direktvermarkter/
 
@@ -25,29 +26,37 @@ Mirror: http://stefang.cepheus.uberspace.de/farmshops/
 ![Map example](https://raw.githubusercontent.com/codeforkarlsruhe/direktvermarkter/master/img/direktvermarkter.png)
 
 Features:
-- Zeigt alle Punkte aus der Region Karlsruhe mit dem Wert shop:farm aus einem GeoJson export von OpenstreetMap an (von overpass-turbo.eu)
-- Unterscheidet Automaten und Hofläden durch grüne und blaue Marker
+- Zeigt alle Punkte aus der DACH-Region mit verschiedenen Tags für Hofläden, Verkaufsautomaten und Märkten aus einem GeoJson export von OpenstreetMap an (über overpass-turbo.eu)
+- Unterscheidet Automaten, Hofläden und Märkte durch unterschiedliche Marker
 - Bereitet Daten auf, macht Links klickbar und übersetzt die häufigsten Begriffe
 - Verlinkt von jedem Punkt auf die identischen Koordinaten auf openstreetmap.org, OpenRouteService und Google Maps
 - Zeigt Punkte und Polygone gleichermaßen an. Polygone erhalten einen Pin in ihrem Zentrum.
 - Permalinks in denen Ort und Zoomlevel weitergegeben werden können
 
+## Popups
+Die Anzeige der Daten im Popup wird in popupcontent.js definiert. Dort findet auch eine einfache Übersetzung einzelner Begriffe statt. 
+
 ## Datenabgleich
 Die Daten stammen aus OSM und werden vom script update_data.js aktualisiert. Siehe dazu auch #6
 Es ist ein node script, dass nach installation des Packets "query-overpass" mit "node update_data.js" ausgeführt werden kann.
 
-Hier ein Einzeiler zum Updaten und Veröffentlichen der Daten:
-
-> cd [PFAD]/direktvermarkter/ && node update_data.js && git add . && git commit -m "autom. Datenupdate" && git push origin master
+Für ein konfortables Update mit automatischen Commit gibt es das shell script update.sh, das auf lange Sicht auch regelmäßig automatisch ausgeführt werden soll.
 
 Das Script verwendet http://overpass-turbo.eu/ um diese Tags von OpenstreetMap zu ziehen:
 
 - https://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm
 - https://wiki.openstreetmap.org/wiki/DE:Tag:amenity%3Dvending_machine
+- https://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace
+
  Wobei vending machines indirekt über die Tags vending:milk und vending:food gezogen werden.
 
-ToDo (siehe auch Issues):
-- Impressum, Infos, Links auf codefor und GitHub usw. 
+## ToDo (siehe auch Issues):
+- Anzeige nur von gewünschten Datentypen
+- Jetzt gerade offen-Funktion
 - Suchfunktion
 - Auswahlmöglichkeit für verschiedene Regionen
-- Howto Datenpflege
+- Howto Datenpflege verbessern
+- Möglichkeit neue Orte direkt eintragen zu können.
+
+
+

browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="icons/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

data/node/1002940391/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace","Betreiber":"Holzerhof"},"name":"Wochenmarkt Holzerhof","address":{"city":"Unbekannt"},"opening_hours":"Sa 08:30-13:30","property":"marketplace","id":"node/1002940391","geometry":{"type":"Point","coordinates":[11.6680159,48.2226592]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace","Betreiber":"Holzerhof"},"name":"Wochenmarkt Holzerhof","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Sa 08:30-13:30","property":"marketplace","id":"node/1002940391","geometry":{"type":"Point","coordinates":[11.6680159,48.2226592]}}

data/node/1003828966/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"shop":"farm"},"name":"Hofladen Gut Stubbe","address":{"city":"Unbekannt"},"opening_hours":"Oct-May: We-Su 09:00-18:00, Mo,Tu off; Jun-Sep: Mo-Su 09:00-18:00","property":"farm","id":"node/1003828966","geometry":{"type":"Point","coordinates":[9.8244018,54.5799218]}}
+{"type":"Feature","properties":{"shop":"farm"},"name":"Hofladen Gut Stubbe","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Oct-May: We-Su 09:00-18:00, Mo,Tu off; Jun-Sep: Mo-Su 09:00-18:00","property":"farm","id":"node/1003828966","geometry":{"type":"Point","coordinates":[9.8244018,54.5799218]}}

data/node/1012200083/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"shop":"farm"},"name":"Bio-Laden Albertshof","address":{"city":"Unbekannt"},"opening_hours":"Unbekannt","property":"farm","id":"node/1012200083","geometry":{"type":"Point","coordinates":[8.0579777,50.6020012]}}
+{"type":"Feature","properties":{"shop":"farm"},"name":"Bio-Laden Albertshof","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"farm","id":"node/1012200083","geometry":{"type":"Point","coordinates":[8.0579777,50.6020012]}}

data/node/1013641767/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Betreiber":"Agrargenossenschaft Memmendorf","Telefon":"+49 37292 60833","shop":"farm"},"name":"Landmarkt Memmendorf","address":{"street":"Zum Erbgericht","housenumber":"7","postcode":"09569","city":"Oederan","suburb":"Memmendorf"},"opening_hours":"Unbekannt","property":"farm","id":"node/1013641767","geometry":{"type":"Point","coordinates":[13.1929016,50.8884993]}}
+{"type":"Feature","properties":{"Betreiber":"Agrargenossenschaft Memmendorf","Telefon":"+49 37292 60833","shop":"farm"},"name":"Landmarkt Memmendorf","address":{"street":"Zum Erbgericht","housenumber":"7","postcode":"09569","city":"Oederan","suburb":"Memmendorf","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"farm","id":"node/1013641767","geometry":{"type":"Point","coordinates":[13.1929016,50.8884993]}}

data/node/1017755340/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"shop":"farm"},"name":"Biolandhof Petrik","address":{"street":"Am Heulenberg","housenumber":"1","postcode":"76327","city":"Pfinztal"},"opening_hours":"Tu 09:00-18:00;Fr 09:00-18:00; Sa 8:30-12:30","property":"farm","id":"node/1017755340","geometry":{"type":"Point","coordinates":[8.5454803,49.0008602]}}
+{"type":"Feature","properties":{"shop":"farm"},"name":"Biolandhof Petrik","address":{"street":"Am Heulenberg","housenumber":"1","postcode":"76327","city":"Pfinztal","country":"Germany","country_code":"de"},"opening_hours":"Tu 09:00-18:00;Fr 09:00-18:00; Sa 8:30-12:30","property":"farm","id":"node/1017755340","geometry":{"type":"Point","coordinates":[8.5454803,49.0008602]}}

data/node/1018992427/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Wochenmarkt","address":{"city":"Unbekannt"},"opening_hours":"Sa 08:00-12:00","property":"marketplace","id":"node/1018992427","geometry":{"type":"Point","coordinates":[9.8865835,47.6011632]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Wochenmarkt","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Sa 08:00-12:00","property":"marketplace","id":"node/1018992427","geometry":{"type":"Point","coordinates":[9.8865835,47.6011632]}}

data/node/1022164723/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"address":{"city":"Unbekannt"},"opening_hours":"Th 08:00 -13:00","property":"marketplace","id":"node/1022164723","geometry":{"type":"Point","coordinates":[9.8905907,52.4657816]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Th 08:00 -13:00","property":"marketplace","id":"node/1022164723","geometry":{"type":"Point","coordinates":[9.8905907,52.4657816]}}

data/node/1029611913/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Röhlinghausen Markt","address":{"city":"Unbekannt"},"opening_hours":"Unbekannt","property":"marketplace","id":"node/1029611913","geometry":{"type":"Point","coordinates":[7.155067,51.5133484]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Röhlinghausen Markt","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"marketplace","id":"node/1029611913","geometry":{"type":"Point","coordinates":[7.155067,51.5133484]}}

data/node/1032440043/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Wochenmarkt Sendling","address":{"city":"Unbekannt"},"opening_hours":"We 08:00-12:00","property":"marketplace","id":"node/1032440043","geometry":{"type":"Point","coordinates":[11.5244999,48.111543]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Wochenmarkt Sendling","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"We 08:00-12:00","property":"marketplace","id":"node/1032440043","geometry":{"type":"Point","coordinates":[11.5244999,48.111543]}}

data/node/1051181822/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Bauernmarkt","address":{"city":"Unbekannt"},"opening_hours":"Unbekannt","property":"marketplace","id":"node/1051181822","geometry":{"type":"Point","coordinates":[14.6298355,52.1493103]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Bauernmarkt","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"marketplace","id":"node/1051181822","geometry":{"type":"Point","coordinates":[14.6298355,52.1493103]}}

data/node/1055207446/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"shop":"farm"},"name":"Hemme Milch","address":{"street":"Sprockhofer Straße","housenumber":"9","postcode":"30900","city":"Wedemark"},"opening_hours":"Unbekannt","property":"farm","id":"node/1055207446","geometry":{"type":"Point","coordinates":[9.7169659,52.6086905]}}
+{"type":"Feature","properties":{"shop":"farm"},"name":"Hemme Milch","address":{"street":"Sprockhofer Straße","housenumber":"9","postcode":"30900","city":"Wedemark","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"farm","id":"node/1055207446","geometry":{"type":"Point","coordinates":[9.7169659,52.6086905]}}

data/node/1065182174/details.json

@@ -1 +1,5 @@
-{"type":"Feature","properties":{"Betreiber":"Eiserbeck Naturprodukte UG","Biologisch":"ja","shop":"farm"},"name":"Urkraft Leinmanufaktur","address":{"city":"Unbekannt"},"opening_hours":"Unbekannt","website":"http://www.urkraft-leinmanufaktur.de/","property":"farm","id":"node/1065182174","geometry":{"type":"Point","coordinates":[12.7838361,51.9451804]}}
+<<<<<<< HEAD
+{"type":"Feature","properties":{"Betreiber":"Eiserbeck Naturprodukte UG","Biologisch":"ja","Produzieren":"lineseed","shop":"farm"},"name":"Urkraft Leinmanufaktur","address":{"street":"Rahnsdorfer Lindenstraße","housenumber":"22","postcode":"06895","city":"Zahna-Elster","suburb":"Rahnsdorf","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","website":"http://www.urkraft-leinmanufaktur.de/","property":"farm","id":"node/1065182174","geometry":{"type":"Point","coordinates":[12.7838361,51.9451804]}}
+=======
+{"type":"Feature","id":"node/1065182174","properties":{"addr:city":"Zahna-Elster","addr:country":"DE","addr:housenumber":"22","addr:postcode":"06895","addr:street":"Rahnsdorfer Lindenstraße","addr:suburb":"Rahnsdorf","name":"Urkraft Leinmanufaktur","operator":"Eiserbeck Naturprodukte UG","organic":"yes","produce":"lineseed","shop":"farm","website":"http://www.urkraft-leinmanufaktur.de/","id":"node/1065182174"},"geometry":{"type":"Point","coordinates":[12.7838361,51.9451804]}}
+>>>>>>> e8678e7c3ee013da311017303c70b8aa6c6329db

data/node/1066562663/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"brand":"Bioland","Betreiber":"A. und K. Engemann GbR","Biologisch":"nur","Telefon":"+49 56 44 98 111 0","shop":"farm","Rollstuhlgerecht":"ja"},"name":"Biolandhof Engemann","address":{"street":"Zum Südholz","housenumber":"11","postcode":"34439","city":"Willebadessen","suburb":"Eissen"},"opening_hours":"Mo-Tu 09:00-12:00,15:00-18:00; Th-Fr 09:00-12:00,15:00-18:00; Sa 09:00-12:00","website":"http://www.engemann-bio.de/","property":"farm","id":"node/1066562663","geometry":{"type":"Point","coordinates":[9.1647516,51.5703751]}}
+{"type":"Feature","properties":{"brand":"Bioland","Betreiber":"A. und K. Engemann GbR","Biologisch":"nur","Telefon":"+49 56 44 98 111 0","shop":"farm","Rollstuhlgerecht":"ja"},"name":"Biolandhof Engemann","address":{"street":"Zum Südholz","housenumber":"11","postcode":"34439","city":"Willebadessen","suburb":"Eissen","country":"Germany","country_code":"de"},"opening_hours":"Mo-Tu 09:00-12:00,15:00-18:00; Th-Fr 09:00-12:00,15:00-18:00; Sa 09:00-12:00","website":"http://www.engemann-bio.de/","property":"farm","id":"node/1066562663","geometry":{"type":"Point","coordinates":[9.1647516,51.5703751]}}

data/node/1067481549/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"shop":"farm"},"address":{"city":"Unbekannt"},"opening_hours":"Unbekannt","property":"farm","id":"node/1067481549","geometry":{"type":"Point","coordinates":[9.273764,52.0631863]}}
+{"type":"Feature","properties":{"shop":"farm"},"address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"farm","id":"node/1067481549","geometry":{"type":"Point","coordinates":[9.273764,52.0631863]}}

data/node/1068790927/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"shop":"farm"},"name":"Brunkhorst's Feldfrüchte","address":{"city":"Unbekannt"},"opening_hours":"Unbekannt","property":"farm","id":"node/1068790927","geometry":{"type":"Point","coordinates":[9.2456886,52.3694955]}}
+{"type":"Feature","properties":{"shop":"farm"},"name":"Brunkhorst's Feldfrüchte","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"farm","id":"node/1068790927","geometry":{"type":"Point","coordinates":[9.2456886,52.3694955]}}

data/node/1076529608/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"address":{"city":"Unbekannt"},"opening_hours":"Tu,Fr 08:00-13:00","property":"marketplace","id":"node/1076529608","geometry":{"type":"Point","coordinates":[7.4498047,50.7702308]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Tu,Fr 08:00-13:00","property":"marketplace","id":"node/1076529608","geometry":{"type":"Point","coordinates":[7.4498047,50.7702308]}}

data/node/1076903570/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Biologisch":"nur","Telefon":"+49 39828 26740","shop":"farm"},"name":"Naturladen Seewalde","address":{"postcode":"17255"},"opening_hours":"Mo-Fr 09:00-18:00; Sa 10:00-13:00; Su off","property":"farm","id":"node/1076903570","geometry":{"type":"Point","coordinates":[12.9326222,53.2267042]}}
+{"type":"Feature","properties":{"Biologisch":"nur","Telefon":"+49 39828 26740","shop":"farm"},"name":"Naturladen Seewalde","address":{"postcode":"17255","country":"Germany","country_code":"de"},"opening_hours":"Mo-Fr 09:00-18:00; Sa 10:00-13:00; Su off","property":"farm","id":"node/1076903570","geometry":{"type":"Point","coordinates":[12.9326222,53.2267042]}}

data/node/1077100575/details.json

@@ -1 +1 @@
-{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Platz der Zähringer","address":{"city":"Unbekannt"},"opening_hours":"Unbekannt","property":"marketplace","id":"node/1077100575","geometry":{"type":"Point","coordinates":[7.8583464,48.0231541]}}
+{"type":"Feature","properties":{"Einrichtung ":"marketplace"},"name":"Platz der Zähringer","address":{"city":"Unbekannt","country":"Germany","country_code":"de"},"opening_hours":"Unbekannt","property":"marketplace","id":"node/1077100575","geometry":{"type":"Point","coordinates":[7.8583464,48.0231541]}}