Fix iJSON tiles and touch dragging of the map

dschwen · Aug 9, 2022 · 2dfd196 · 2dfd196
1 parent 3f84715
commit 2dfd196
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 56 deletions.
diff --git a/min/wmacore.min.js b/min/wmacore.min.js
diff --git a/min/wmacore_dev.min.js b/min/wmacore_dev.min.js
diff --git a/tiles/jsontile_dev.php b/tiles/jsontile_dev.php
@@ -48,8 +48,11 @@ function beginsWith($str, $sub) {
 
 //exit; // DB server under maintenance
 
-//$dbconn = pg_connect("host=sql-mapnik dbname=osm_mapnik port=5433");
-$dbconn = pg_connect("host=osmdb.eqiad.wmnet dbname=gis user=osm");
+// connect to database
+$ts_pw = posix_getpwuid(posix_getuid());
+$ts_mycnf = parse_ini_file($ts_pw['dir'] . "/postgres.cnf");
+$dbconn = pg_connect("host=maps-osmdb dbname=gis user=" . $ts_mycnf['user'] . " password=" . $ts_mycnf['password']);
+unset($ts_mycnf, $ts_pw);
 
 // size of zoom level in tiles
 $mx = 3 * ( 2 << $z );
@@ -72,6 +75,12 @@ function beginsWith($str, $sub) {
 $urx = ($x+1) * 60.0 / (1<<$z);
 $ury = 90.0 - ( ($y*60.0) / (1<<$z) );
 
+// make sure the longitude is between -180 and 180
+if ($urx>180.0) {
+  $urx -= 360.0;
+  $llx -= 360.0;
+}
+
 // add ten pixel worth of padding
 $dx = ($urx-$llx)*10/128;
 $dy = ($ury-$lly)*10/128;
@@ -81,24 +90,21 @@ function beginsWith($str, $sub) {
 $ury += $dy;
 
 // get mercator bounds
-$mllx = deg2rad($llx>180?($llx-360.0):$llx)*6378137.0;
+$mllx = deg2rad($llx)*6378137.0;
 $mlly = log(tan(M_PI_4 + deg2rad($lly) / 2.0)) * 6378137.0;
-$murx = deg2rad($urx>180?($urx-360.0):$urx)*6378137.0;
+$murx = deg2rad($urx)*6378137.0;
 $mury = log(tan(M_PI_4 + deg2rad($ury) / 2.0)) * 6378137.0;
 
 
-$tags = array( "highway", "railway", "waterway", "landuse", "leisure", "building", "natural", "amenity", "name", "boundary", "osm_id","layer","access","route", "historic", "tunnel", "aeroway", "aerialway", "tourism" );
+$tags = array( "highway", "railway", "waterway", "landuse", "leisure", "building", "natural", "amenity", "name", "boundary", "osm_id","layer","access","route", "historic", "tunnel", "aeroway", "aerialway", "tourism", "man_made" );
 $taglist = '"'.implode($tags,'", "').'"';
 $tagnum = count($tags);
-$intersect = "
-          ST_Intersection( 
-            way,
-            SetSRID('BOX3D($mllx $mlly, $murx $mury)'::box3d,900913)
-          )";
-//transform( ST_GeomFromText('POLYGON(($llx $ury, $urx $ury, $urx $lly, $llx $lly, $llx $ury))', 4326 ), 900913 )
-$table = array( 
-  array('planet_osm_polygon','building IS NULL AND  not exist(hstore(tags),\'building:part\') AND',$intersect), 
-  array('planet_osm_line','building IS NULL AND  not exist(hstore(tags),\'building:part\') AND',$intersect)
+$box = "ST_Transform(ST_SetSRID('BOX3D( $llx $lly, $urx $ury )'::box3d,4326),3857)";
+$intersect = "ST_Intersection(way, $box)";
+//transform( ST_GeomFromText('POLYGON(($llx $ury, $urx $ury, $urx $lly, $llx $lly, $llx $ury))', 4326 ), 3857 )
+$table = array(
+  array('planet_osm_polygon','building IS NULL AND (tags IS NULL OR NOT exist(hstore(tags),\'building:part\')) AND',$intersect),
+  array('planet_osm_line','building IS NULL AND (tags IS NULL OR NOT exist(hstore(tags),\'building:part\')) AND',$intersect)
 );
 
 // also return buildings for large zoom levels
@@ -113,14 +119,14 @@ function beginsWith($str, $sub) {
 for( $i=0; $i<count($table); $i++ ) {
   // build query for the cropped data without buildings
   $query = "
-    select 
-      ST_AsGeoJSON( transform(".$table[$i][2].",4326), 9 ),
+    select
+      ST_AsGeoJSON( ST_Transform(".$table[$i][2].",4326), 9 ),
       tags, $taglist
       from ".$table[$i][0]."
     where
-      ".$table[$i][1]."
-      ST_IsValid(way) AND way && SetSRID('BOX3D($mllx $mlly, $murx $mury)'::box3d,900913);
-  ";
+      ".$table[$i][1]." ST_IsValid(way) AND ST_Intersects(way, $box);";
+      // ".$table[$i][1]." ST_IsValid(way) AND way && $box;";
+  // ST_IsValid(way) AND way && ST_SetSRID('BOX3D($llx $lly, $urx $ury)'::box3d,4326);
 
   // debug
   if ($a === 'query') {
@@ -135,7 +141,7 @@ function beginsWith($str, $sub) {
   }
 
   while ($row = pg_fetch_row($result)) {
-    // decode geometry 
+    // decode geometry
     $thisgeo = json_decode($row[0]);
 
     // is the geometry empty? then fetch next
@@ -154,7 +160,7 @@ function beginsWith($str, $sub) {
         } else {
           $tagfound[$tags[$j]] = 1;
         }
-        
+
         // server side index
         if( array_key_exists($tags[$j], $idx) ) {
           $idx[$tags[$j]][] = count($geo);
@@ -168,8 +174,8 @@ function beginsWith($str, $sub) {
     if( $row[1] !== null ) {
       $hstore = json_decode('{' . str_replace('"=>"', '":"', $row[1]) . '}', true);
       foreach( $hstore as $j => $val ) {
-        //if( beginsWith($j,'name:') ||  beginsWith($j,'tiger:')  ||  beginsWith($j,'nist:') ) continue;   
-        if( beginsWith($j,'tiger:')  ||  beginsWith($j,'nist:') ) continue;   
+        //if( beginsWith($j,'name:') ||  beginsWith($j,'tiger:')  ||  beginsWith($j,'nist:') ) continue;
+        if( beginsWith($j,'tiger:')  ||  beginsWith($j,'nist:') ) continue;
         $type[$j]=$val;
 
         if (array_key_exists($j, $tagfound)) {
@@ -194,27 +200,21 @@ function beginsWith($str, $sub) {
 
 if( $a === 'print' ) exit;
 
-// make sure the longitude is between -180 and 180
-if ($urx>180.0) {
-  $urx -= 360.0;
-  $llx -= 360.0;
-}
-
 // get landmass polygons and coastlines
 $table = array('land_polygons','coastlines');
 for ($i=0; $i<2; $i++) {
   // set up query
   $query = "
-    select 
-      ST_AsGeoJSON( 
-        ST_Intersection( 
-          SetSRID(the_geom, 4326),
-          SetSRID('BOX3D($llx $lly, $urx $ury)'::box3d, 4326)
+    select
+      ST_AsGeoJSON(
+        ST_Intersection(
+          ST_SetSRID(wkb_geometry, 4326),
+          ST_SetSRID('BOX3D($llx $lly, $urx $ury)'::box3d, 4326)
         )
       , 9 )
       from ".$table[$i]."
     where
-      the_geom && SetSRID('BOX3D($llx $lly, $urx $ury)'::box3d,4326);
+      ST_Intersects(wkb_geometry, ST_SetSRID('BOX3D($llx $lly, $urx $ury)'::box3d,4326));
   ";
 
   // perform query
@@ -245,7 +245,7 @@ function beginsWith($str, $sub) {
   }
 }
 
-//$s = json_encode( array( "data" => $geo, "x" => $x, "y" => $y, "z" => $z, "f" => $tagfound, "v" => 6, "idx" => $idx, "mbbox" => "$mllx $mlly, $murx $mury", "bbox" => "$llx $lly, $urx $ury" ) );
+//$s = json_encode( array( "data" => $geo, "x" => $x, "y" => $y, "z" => $z, "f" => $tagfound, "v" => 6, "idx" => $idx, "t" => time(), "mbbox" => "$mllx $mlly, $murx $mury", "bbox" => "$llx $lly, $urx $ury" ) );
 $s = json_encode( array( "data" => $geo, "x" => $x, "y" => $y, "z" => $z, "f" => $tagfound, "v" => 6, "idx" => $idx, "t" => time() ) );
 
 // do not cache purge action
@@ -259,7 +259,7 @@ function beginsWith($str, $sub) {
 // write to cache
 if( !is_dir( "jsontile/$z/$y" ) ) {
   $oldumask = umask(0);
-  mkdir("jsontile/$z/$y",0755); 
+  mkdir("jsontile/$z/$y",0755);
   umask($oldumask);
 }
 

diff --git a/wmacore.js b/wmacore.js
@@ -1663,6 +1663,7 @@ function wikiminiatlasInstall(wma_widget, url_params)
   function mouseDownWikiMiniAtlasMap(ev)
   {
     wma_mdcoord = wma_dragging = wmaMouseCoords(ev);
+    ev.preventDefault();
   }
 
   // Mouse move handler

diff --git a/wmacore_dev.js b/wmacore_dev.js
@@ -1663,6 +1663,7 @@ function wikiminiatlasInstall(wma_widget, url_params)
   function mouseDownWikiMiniAtlasMap(ev)
   {
     wma_mdcoord = wma_dragging = wmaMouseCoords(ev);
+    ev.preventDefault();
   }
 
   // Mouse move handler

diff --git a/wmajt.js b/wmajt.js
@@ -33,18 +33,26 @@ var wmajt = (function () {
         ['landuse', { grass: 1 },
           [{ globalAlpha: 0.3, fillStyle: "rgb(0,160,0)" }, { globalAlpha: 1 }]
         ],
+        ['waterway', { riverbank: 1, dock: 1 },
+          [{ fillStyle: "rgb(158,199,243)" }]
+        ],
+        ['waterway', { dam: 1 },
+          [{ fillStyle: "rgb(150,150,150)" }]
+        ],
         ['leisure', {
           park: 1, orchard: 1, meadow: 1, village_green: 1, golf_course: 1, track: 1,
-          forrest: 1, recreation_ground: 1, dog_park: 1, garden: 1, pitch: 1, stadium: 1
+          forrest: 1, recreation_ground: 1, dog_park: 1
         },
           [{ fillStyle: "rgb(200,224,200)" }]
         ],
+        ['leisure', {
+          garden: 1, pitch: 1, stadium: 1
+        },
+          [{ fillStyle: "rgb(180,224,180)" }]
+        ],
         ['leisure', { swimming_pool: 1 },
           [{ fillStyle: "rgb(200,200,224)" }]
         ],
-        ['waterway', { riverbank: 1, dock: 1 },
-          [{ fillStyle: "rgb(158,199,243)" }]
-        ],
         ['natural', { beach: 1, sand: 1 },
           [{ fillStyle: "rgb(250,242,175)" }]
         ],
@@ -64,11 +72,19 @@ var wmajt = (function () {
           [{ fillStyle: "rgb(158,199,243)" },
           { lineWidth: 1, strokeStyle: "rgb(158,199,243)" }]
         ],
+        ['natural', { reef: 1 },
+          [{ fillStyle: "rgb(148,189,223)" },
+          { lineWidth: 1, strokeStyle: "rgb(158,199,243)" }]
+        ],
+        ['man_made', { wastewater_plant: 1, breakwater: 1, pier: 1 },
+          [{ fillStyle: "rgb(168,178,178)" },
+          { lineWidth: 1, strokeStyle: "rgb(140,145,145)" }]
+        ],
         ['natural', { glacier: 1 },
           [{ fillStyle: "rgb(230,245,255)" },
           { lineWidth: 1, strokeStyle: "rgb(255,255,255)" }]
         ],
-        ['amenity', { university: 1 },
+        ['amenity', { university: 1, school: 1 },
           [{ lineWidth: 0.5, strokeStyle: "rgb(240,225,183)" }]
         ],
         ['amenity', { parking: 1 },
@@ -96,10 +112,6 @@ var wmajt = (function () {
           [{ fillStyle: "rgb(210,195,195)" },
           { lineWidth: 1, strokeStyle: "rgb(127,127,127)" }]
         ],
-        ['natural', { water: 1, bay: 1 },
-          [{ fillStyle: "rgb(158,199,243)" },
-          { lineWidth: 1, strokeStyle: "rgb(158,199,243)" }]
-        ],
         /*['building', {yes: 1, block: 1, office: 1, courthouse: 1, church: 1, school: 1, cathedral: 1, residential: 1, house: 1, hut: 1,
           university: 1, hospital: 1, bunker: 1, train_station: 1, chapel: 1, industrial: 1, commercial: 1, retail: 1, hotel: 1,
           apartments: 1, synagogue: 1},
@@ -147,10 +159,7 @@ var wmajt = (function () {
         ['route', { ferry: 1 },
           [{ dash: [4, 4], lineWidth: 2, strokeStyle: "rgb(126,159,194)" }]
         ],
-        ['highway', { pedestrian: 1 },
-          [{ lineWidth: 5, strokeStyle: "rgb(255,255,255)" }]
-        ],
-        ['highway', { footway: 1, pedestrian: 1, path: 1 },
+        ['highway', { footway: 1, pedestrian: 1, path: 1, cycleway: 1 },
           [{ lineWidth: 2, strokeStyle: "rgb(198,178,178)" }]
           //[ { lineWidth: 2, strokeStyle: "rgb(168,148,148)" } ]
         ],

diff --git a/wmajt_dev.js b/wmajt_dev.js
@@ -68,17 +68,21 @@ var wmajt = (function () {
         ['natural', { wood: 1 },
           [{ fillStyle: "rgb(100,204,100)" }]
         ],
-        ['natural', { water: 1, bay: 1 },
+        ['natural', { bay: 1 },
           [{ fillStyle: "rgb(158,199,243)" },
           { lineWidth: 1, strokeStyle: "rgb(158,199,243)" }]
         ],
+        ['man_made', { wastewater_plant: 1, breakwater: 1, pier: 1 },
+          [{ fillStyle: "rgb(168,178,178)" },
+          { lineWidth: 1, strokeStyle: "rgb(140,145,145)" }]
+        ],
         ['natural', { reef: 1 },
           [{ fillStyle: "rgb(148,189,223)" },
           { lineWidth: 1, strokeStyle: "rgb(158,199,243)" }]
         ],
-        ['man_made', { wastewater_plant: 1, breakwater: 1, pier: 1 },
-          [{ fillStyle: "rgb(168,178,178)" },
-          { lineWidth: 1, strokeStyle: "rgb(140,145,145)" }]
+        ['natural', { water: 1 },
+          [{ fillStyle: "rgb(158,199,243)" },
+          { lineWidth: 1, strokeStyle: "rgb(158,199,243)" }]
         ],
         ['natural', { glacier: 1 },
           [{ fillStyle: "rgb(230,245,255)" },