fossgis · Nakaner · Mar 17, 2019 · Mar 2, 2019 · Mar 2, 2019 · Mar 7, 2019
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.*.swp
diff --git a/css/mystyle.css b/css/mystyle.css
@@ -1,5 +1,52 @@
+/* tweaking Bootstrap */
+h2 {
+	margin-top: 20px;
+	line-height: 32px;
+	margin-bottom: 4px;
+}
+
 /* css for general use*/
 
+/* banner EU upload filter */
+#uploadfilter-banner {
+       display: block;
+       font-size: 18px;
+       background-color: #555;
+       color: white;
+       padding: 15px 15px 15px 15px;
+       text-align: center;
+}
+
+#uploadfilter-banner a {
+       color: white;
+}
+
+/* extra styling for upload filter page */
+div.black-warning {
+    background-color: black;
+    color: white;
+    font-size: 18px;
+    padding: 20px 10px 10px 15px;
+    margin-bottom: 15px;
+}
+
+div.black-warning > * {
+    font-size: 18px;
+}
+
+div.black-warning * {
+    color: white;
+    line-height: 21px;
+}
+
+div.black-warning a {
+    text-decoration: underline;
+}
+
+div.black-warning li {
+    margin-top: 4px;
+}
+
 #logo {
 	float: left;
 	margin-top: -45px;

diff --git a/index.html b/index.html
@@ -72,6 +72,9 @@
 
 
 </head>
+<div id="uploadfilter-banner">
+    <a href="uf/index.html">Die neue EU-Urheberrechtsrichtlinie gefährdet das OpenStreetMap-Projekt.</a>
+</div>
 
 <div class="container">
 

diff --git a/karte.html b/karte.html
@@ -3,23 +3,23 @@
 <html>
 <head>
 <title>OpenStreetMap Deutschland: Karte</title>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<meta name="description" content="" />
-	<meta name="keywords" content="" />
-	<meta name="language" content="de" />
-	<meta name="robots" content="index,nofollow" />
-	<meta name="author" content="" />
-	<meta name="revisit-After" content="7 days" />
-	<meta name="distribution" content="global" />
-
-	<!-- required for media queries to work for responsive layout -->
-	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
-	<meta name="apple-mobile-web-app-capable" content="yes" />
-
-	<link rel="icon" href="img/favicon.png" type="image/png">
-	<link rel="Shortcut Icon" href="img/favicon.png" type="image/png">
-
-	<script type="text/javascript" src="map_src/ol/OpenLayers.js"></script>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta name="description" content="" />
+    <meta name="keywords" content="" />
+    <meta name="language" content="de" />
+    <meta name="robots" content="index,nofollow" />
+    <meta name="author" content="" />
+    <meta name="revisit-After" content="7 days" />
+    <meta name="distribution" content="global" />
+
+    <!-- required for media queries to work for responsive layout -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+
+    <link rel="icon" href="img/favicon.png" type="image/png">
+    <link rel="Shortcut Icon" href="img/favicon.png" type="image/png">
+
+    <script type="text/javascript" src="map_src/ol/OpenLayers.js"></script>
     <!-- <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script> -->
     <script type="text/javascript" src="map_src/ol//OpenStreetMap.js"></script>
 
@@ -30,7 +30,6 @@
     <script type="text/javascript" src="map_src/js/utils.js"></script>
     <script type="text/javascript" src="map_src/js/markers.js"></script>
     <script type="text/javascript" src="map_src/js/geocode.js"></script>
-    <script type="text/javascript" src="map_src/js/slider.js"></script>
 
     <link rel="stylesheet" href="css/bootstrap.css" type="text/css" media="all" />
     <link rel="stylesheet" href="map_src/style.css" type="text/css" media="all" />
@@ -41,65 +40,61 @@
 </head>
 
 <body onload="init()">
+    <div id="karte_nav">
+        <ul class="lnav">
+            <li><a href="index.html">Startseite</a></li>
+            <li><a href="faq.html">FAQ</a></li>
+            <li><a href="karte.html">Karte</a></li>
+            <li><a href="community.html">Community</a></li>
+            <li><a target="_blank" href="http://blog.openstreetmap.de">Blog/News</a></li>
+            <li><a href="spenden.html">Spenden</a></li>
+            <li><a href="impressum.html">Kontakt/Impressum</a></li>
+            <li><a href="https://www.fossgis.de/datenschutzerklaerung">Datenschutz</a></li>
+        </ul>
+    </div>
+    <div id="uploadfilter-banner">
+        <a href="uf/index.html">Die neue EU-Urheberrechtsrichtlinie gefährdet das OpenStreetMap-Projekt.</a>
+    </div>
 
-<div id="everything-else">
-	<div id="karte_nav">
-		<div class="mtop">
-		    <div class="mnav lnav">
-		        <ul>
-		           	<li><a href="index.html">Startseite</a></li>
-	            	<li><a href="faq.html">FAQ</a></li>
-	            	<li><a href="karte.html">Karte</a></li>
-	            	<li><a href="community.html">Community</a></li>
-	            	<li><a target="_blank" href="http://blog.openstreetmap.de">Blog/News</a></li>
-	            	<li><a href="spenden.html">Spenden</a></li>
-	            	<li><a href="impressum.html">Kontakt/Impressum</a></li>
-		            <li><a href="https://www.fossgis.de/datenschutzerklaerung">Datenschutz</a></li>
-		        </ul>
-		    </div>
-		</div>
-	</div>
-
-	<div id="logo">
-	    <a href="index.html"><img id="osm_logo" src="img/osm_logo.png" alt="logo"/></a>
-	</div>
 
-    <div id="search">
-    	<input name="tfSearch" type="text" id="tfSearch" class="tfSearch" value="Behrenstraße, Berlin" title="Such nach deiner Adresse ..." onfocus="if(this.value=='Behrenstraße, Berlin') {this.value=''; this.style.color='#000000';}" onblur="if(this.value=='') {this.value='Behrenstraße, Berlin'; this.style.color='#999999';}" onKeyPress="checkReturn('geocode',event);">
-        <a href="#" class="btn" id="searchButton" onClick="geocodeAddress(this);">Suchen</a>
-    </div>
+    <div id="controls-row">
+        <a href="index.html" id="osm_logo_link"><img id="osm_logo" src="img/osm_logo.png" alt="OSM-Logo"/></a>
 
-    <!-- Buttons -->
-    <div id="Route"></div>
-    <div id="editMap"></div>
-    <div id="errorMap"></div>
+        <div id="search">
+            <input name="tfSearch" type="text" id="tfSearch" class="tfSearch" value="Behrenstraße, Berlin" title="Such nach deiner Adresse ..." onfocus="if(this.value=='Behrenstraße, Berlin') {this.value=''; this.style.color='#000000';}" onblur="if(this.value=='') {this.value='Behrenstraße, Berlin'; this.style.color='#999999';}" onKeyPress="checkReturn('geocode',event);">
+            <a href="#" class="btn" id="searchButton" onClick="geocodeAddress(this);">Suchen</a>
+            <div id="resultBox">
+                <div id="information"></div>
+                <img id="closeResultBox" src="map_src/img/close.gif">
+            </div>
+        </div>
 
-	<div id="wrapper">
-    	<div id="slider" style="width:320px;overflow:hidden;display:none;">
-    	    <div id="slideButton"><a href="javascript:;" onmousedown="document.getElementById('information').innerHTML = ''; toggleSlide('slider');"><img src="map_src/img/close.gif"></a></div>
-			<div id="information"></div>
-		</div>
-    	<div id="map"></div>
+        <!-- Buttons -->
+        <div id="Route"></div>
+        <div id="editMap"></div>
+        <div id="errorMap"></div>
     </div>
 
-    <div id="legend"><a href="#" onClick="updateMapKey(true);">Legende</a></div>
+    <div id="map">
+    </div>
 
     <div id="copyright"><a target="_blank" href="http://www.openstreetmap.org/">Karte hergestellt aus OpenStreetMap-Daten</a> |
     Lizenz: <a rel="license" target="_blank" href="http://opendatacommons.org/licenses/odbl/">Open Database License (ODbL)</a>
     </div>
-</div>
-	<script type="text/javascript">
-		  $('baseLbl').html('Grundkarte');
-		  // remove iPhone address bar on load
-		  // When ready...
-		  window.addEventListener("load",function() {
-		    // Set a timeout...
-		    setTimeout(function(){
-		      // Hide the address bar!
-		      window.scrollTo(0, 1);
-		    }, 0);
-		  });
- 	</script>
+    <script type="text/javascript">
+          $('baseLbl').html('Grundkarte');
+          // remove iPhone address bar on load
+          // When ready...
+          window.addEventListener("load",function() {
+            // Set a timeout...
+            setTimeout(function(){
+              // Hide the address bar!
+              window.scrollTo(0, 1);
+            }, 0);
+          });
+        // close list of geocoding results
+        document.getElementById('closeResultBox').addEventListener('click', closeResultBox);
+    </script>
     <script type="text/javascript" src="map_src/js/searchtypes.js"></script>
 
 </body>

diff --git a/map_src/js/geocode.js b/map_src/js/geocode.js
@@ -33,6 +33,11 @@
 var GEOCODE_POST =  'https://nominatim.openstreetmap.org/search.php?format=json&json_callback=showResultsGeocode';
 var searchType = 'search';
 
+/* close result box */
+function closeResultBox(e) {
+    document.getElementById('resultBox').style.display = 'none';
+}
+
 //======================
 // FUNCTIONS
 /*
@@ -63,7 +68,7 @@ function geocodeAddress(){
 			setMarkerAndZoom(new OpenLayers.LonLat(longtitude,latitude));
 	}
 	else {
-			document.getElementById('information').style.visibility = 'visible';
+			document.getElementById('information').style.display = 'block';
 			document.getElementById('information').innerHTML =  '<p class="infoHL">Einen Moment bitte ...</p>';
 
 			var newURL = GEOCODE_POST + "&q="+freeform;
@@ -78,52 +83,40 @@ function geocodeAddress(){
  * showResultsGeocode()-Function to show the geocode result in a div
  */
 function showResultsGeocode(response) {
-	openSlide('slider');
-
     var html = '';    
     var lonlat = '';
 
 	if(response){
-		html += '<table width="190px">'
-		html += ' <tr class="infoHL"><td colspan="2">Ergebnis der Adresssuche:</td></tr>';
+		html += '<p>Ergebnisse der Adresssuche:<p>';
+		html += '<ul class="result-list">'
 
 		for(var i=0; i < response.length; i++){
-			var result = response[i]; var resultNum = i+1;			
-        	//odd or even ?
-        	var rowstyle='geocodeResultOdd';
-        	if(i%2==0){ rowstyle='geocodeResultEven'; }
-
-			html += '<tr class="'+rowstyle+'">';
-			html += '<td align="right" valign="top"><span class="routeSummarybold">'+resultNum+'.</span></td>';
-			html += '<td class="'+rowstyle+'">';
+			var result = response[i];
+			html += '<li>';
 			if (result.class && result.type && result.class in geocoder_searchtypes &&
 			       geocoder_searchtypes[result.class][result.type] != undefined) {
 				html += geocoder_searchtypes[result.class][result.type] + ' ';
 			}
 			if(result.display_name){
 				var new_display_name = result.display_name;//.replace(/,/g, ",<br />")
-				html += '<a href="#" onclick="javascript:setMarkerAndZoom(new OpenLayers.LonLat('+result.lon+','+result.lat+'));">'+new_display_name.trim()+'</a>';
+				html += '<a href="#" onclick="javascript:setMarkerAndZoom(new OpenLayers.LonLat('+result.lon+','+result.lat+'), true)">'+new_display_name.trim()+'</a>';
 			}
-			html += '</td><td>';
-			if(result.icon){
-				html += '<img src="' + result.icon + '">';
-			}
-			html += "</td></tr>";
+			html += "</li>";
 
 			if(lonlat == ''){
 				lonlat = new OpenLayers.LonLat(result.lon,result.lat);
 			}
 		}		
-		html += '</table>';
+		html += '</ul>';
 
 		if(lonlat != ''){ setMarkerAndZoom(lonlat); }
-		else{ html = '<br><br>Sorry, keine entsprechende Adresse gefunden!'; }
+		else{ html = '<p>Sorry, keine entsprechende Adresse gefunden!</p>'; }
 	}
 
 
     switch (searchType) {
 		case "search":
-			document.getElementById('information').style.display = "";
+			document.getElementById('resultBox').style.display = "flex";
 			document.getElementById('information').innerHTML = html;
 			break;
 	}
@@ -132,13 +125,16 @@ function showResultsGeocode(response) {
 /*
  * setMarkerAndZoom()-Function to set a marker on the map and zoom
  */
-function setMarkerAndZoom(lonlat){
+function setMarkerAndZoom(lonlat, closeResultList){
 	setMarker(lonlat);
 
 	//Hack - FIXME !
 	lonlat.lon -= 450;
 	//Set Center with Zoom
 	map.setCenter(lonlat, 15);
+        if (closeResultList) {
+            closeResultBox();
+        }
 }
 
 /*

diff --git a/map_src/js/map.js b/map_src/js/map.js
@@ -112,7 +112,6 @@ function init(){
     //Register Events for MapEdit and ReportBug Links
     map.events.register('move', null, mapMoved);
     mapMoved();
-    map.events.register('zoomend', null, function() { updateMapKey(false); } );
 
    	//To fix language issues
     //document.getElementsByClassName('baseLbl')[0].innerHTML = "Grundkarte";
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,9 @@ @@
     </head>
+    <div id="uploadfilter-banner">
+        <a href="uf/index.html">Die neue EU-Urheberrechtsrichtlinie gefährdet das OpenStreetMap-Projekt.</a>
+    </div>
     <div class="container">
@@ Expand Down @@