Bug fixed (again)

babykarte · Aug 16, 2019 · ab0d831 · ab0d831
1 parent 9d82cc9
commit ab0d831
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 1 deletion.
diff --git a/ToDo b/ToDo
@@ -0,0 +1,9 @@
+- Parks nur mit Namen anzeigen (v.1) https://www.openstreetmap.org/relation/1394363 v.1 Implemented
+- Öffnungszeiten gestaffelt nach Wochen (v.1) Implemented but not as good as we wish
+- 'playgrounds' extra mappen (als marker) (v.2)
+- 'Home' in poi detail view standartmäßig anzeigen. (v.1) - Implemented
+- Größe für die Popups (fest definieren) (v.1) - Implemented
+- Bei der Suche von Filter, die entsprechenden Marker und Popups aufploppen lassen (v.1) - Implemented partially
+- 'Stroller' als Filter (v.2)
+
+http://localhost:8080/#16&54.31880116386248&10.132282375852812
diff --git a/analysation b/analysation
@@ -0,0 +1,19 @@
+# Bewertungssystem
+
+## Merkmale
+
+index = 0
+
+- diaper=*    4
+  - yes   2
+  - no    1
+- highchair=*   4 (nur für POIs, in denen es Speisen gibt)
+  - yes    2
+  - no     1
+- kids_area=*  2
+  - yes    2
+  - no     1
+- stroller=*   3
+  - yes       3
+  - limited   2
+  - no        1
diff --git a/index_test.html b/index_test.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Babykarte</title>
+  	<meta charset='utf-8'>
+    <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no'>
+    <link rel='stylesheet' href='/style.css' />
+  </head>
+  <body>
+  	<div id='progressbar'></div>
+  	<div class='info' id='infoPopup' style='display:none;'></div>
+  	<section>
+
+	</section>
+	<!--<script src='http://openingh.openstreetmap.de/opening_hours.js/opening_hours+deps.min.js'></script>
+	<script>
+		var nominatimJSON = {"place_id":"16635879","licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":"1538016013","lat":"48.1581513","lon":"11.5104945","display_name":"Südliche Auffahrtsallee, Bezirksteil Neuhausen, Stadtbezirk 09 Neuhausen-Nymphenburg, Munich, Upper Bavaria, Bavaria, 80638, Germany","address":{"road":"Südliche Auffahrtsallee","suburb":"Bezirksteil Neuhausen","city_district":"Stadtbezirk 09 Neuhausen-Nymphenburg","city":"Munich","state_district":"Upper Bavaria","state":"Bavaria","postcode":"80638","country":"Germany","country_code":"de"},"boundingbox":["48.1580513","48.1582513","11.5103945","11.5105945"]}
+		var oh = new opening_hours("open; Tu-Su 08:30-09:00 off; Tu-Su,PH 14:00-14:30 off; Mo 08:00-13:00 off", nominatimJSON);
+		var from = new Date();
+		var to = parseInt(String(from).split(" ")[2]) + 7;
+		to = String(to) + " " + String(from).split(" ")[1] + " " + String(from).split(" ")[3]
+		to   = new Date(to);
+		var iterator = oh.getOpenIntervals(from, to);
+		for (var item in iterator) {
+			console.log(iterator[item][1] + "-" + iterator[item][0]);
+		}
+	</script>-->
+	<script src='oh-interpreter.js'></script>
+  </body>
+</html>
diff --git a/js/overpass.js b/js/overpass.js
@@ -503,7 +503,7 @@ function getRightPopup(marker, usePopup) {
 		"furtherInfos": {"content": `<b>${ getText().PDV_OPERATOR }:</b><br/> ${ ((poi.tags["operator"]) ? poi.tags["operator"] + "<br/>" : "NODISPLAY") }\n<b>${ getText().PDV_DESCRIPTION }:</b><br/>"${ ((poi.tags["description:" + languageOfUser]) ? getText().PDV_DESCRIPTION + ": " + poi.tags["description:" + languageOfUser] : ((poi.tags["description"]) ? getText().PDV_DESCRIPTION + ": " + poi.tags["description"] : "NODISPLAY")) }"<br/>\n<a target='_blank' href='${ "https://www.openstreetmap.org/" + String(poi.type).toLowerCase() + "/" + String(poi.id) }'>${ getText().LNK_OSM_VIEW }</a><br/>\n<a href='${ "geo:" + poi.lat + "," + poi.lon }'>${ getText().LNK_OPEN_WITH }</a>`, "symbol": "ℹ️", "title": getText().PDV_TITLE_MI, "active": true}
 		},
 	"playgroundPopup":
-		{"home": {"content": `<h1>${ ((poi.tags["name"] != undefined) ? poi.tags["name"] : marker.name) }</h1><h2>${ ((poi.tags["name"] != undefined) ? "" : marker.name) }</h2>${ processContentDatabase(marker, poi, PEP_data) }`, "symbol": "🏠", "title": getText().PDV_TITLE_HOME, "active": true, "default": true},
+		{"home": {"content": `<h1>${ ((poi.tags["name"] != undefined) ? poi.tags["name"] : marker.name) }</h1><h2>${ ((poi.tags["name"] == undefined) ? "" : marker.name) }</h2>${ processContentDatabase(marker, poi, PEP_data) }`, "symbol": "🏠", "title": getText().PDV_TITLE_HOME, "active": true, "default": true},
 		"furtherInfos": {"content": `<a target='_blank' href='${ "https://www.openstreetmap.org/" + String(poi.type).toLowerCase() + "/" + String(poi.id) }'>${ getText().LNK_OSM_VIEW }</a><br/>\n<a href='${ "geo:" + poi.lat + "," + poi.lon }'>${ getText().LNK_OPEN_WITH }</a>`, "symbol": "ℹ️", "title": getText().PDV_TITLE_MI, "active": true}
 		}
 	};