Force the X-Page-Title value to be treated as UTF-8

[rails.git] / app / assets / javascripts / osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 0b84686634428c666ddd5fd7d9e4be25d98109e5..d350b28969ccc020e3e403fd259da648c1bdebcf 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -46,6 +46,15 @@ OSM = {
       mapParams.mlat = parseFloat(params.mlat);
     }
 
       mapParams.mlat = parseFloat(params.mlat);
     }
 

+    // Old-style object parameters; still in use for edit links e.g. /edit?way=1234
+    if (params.node) {
+      mapParams.object = {type: 'node', id: parseInt(params.node)};
+    } else if (params.way) {
+      mapParams.object = {type: 'way', id: parseInt(params.way)};
+    } else if (params.relation) {
+      mapParams.object = {type: 'relation', id: parseInt(params.relation)};
+    }
+

     var hash = OSM.parseHash(location.hash);
 
     // Decide on a map starting position. Various ways of doing this.
     var hash = OSM.parseHash(location.hash);
 
     // Decide on a map starting position. Various ways of doing this.


@@ -106,6 +115,10 @@ OSM = {
 
     hash = querystring.parse(hash);
 
 
     hash = querystring.parse(hash);
 

+    if (hash.map === undefined) {
+      return false;
+    }
+

     var args = hash.map.split("/");
     if (args.length !== 3) {
       return false;
     var args = hash.map.split("/");
     if (args.length !== 3) {
       return false;