From b16fc055091afa6708a62069a009b1f96a80e11e Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 20 May 2013 12:15:47 +0000 Subject: [PATCH] 2013-05-20 Miguel de Dios * pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql, pandoradb_data.sql: set by default the tiles for the openstreetmap layer in pretty "MapQuest Open" but there is old (ugly) tiles openstreetmap. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8165 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/pandoradb.data.oracle.sql | 3 ++- pandora_console/pandoradb.data.postgreSQL.sql | 5 ++++- pandora_console/pandoradb_data.sql | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2453ff7aea..58324cf4ef 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-05-20 Miguel de Dios + + * pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql, + pandoradb_data.sql: set by default the tiles for the openstreetmap + layer in pretty "MapQuest Open" but there is old (ugly) tiles + openstreetmap. + 2013-05-20 Miguel de Dios * include/functions_gis.php, operation/gis_maps/render_view.php, diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index 7ea23c134f..e5fab2640f 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -1091,7 +1091,8 @@ END;; BEGIN LOCK TABLE tgis_map_connection IN EXCLUSIVE MODE; -INSERT INTO tgis_map_connection VALUES (1,'OpenStreetMap','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); +INSERT INTO tgis_map_connection VALUES (1,'OpenStreetMap (MapQuest Open)','OSM','{\"type\":\"OSM\",\"url\":\"http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); +INSERT INTO tgis_map_connection VALUES (2,'OpenStreetMap (Standard)','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); COMMIT; END;; diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 867f02272a..0d0eb30780 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -1022,8 +1022,11 @@ INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (202,6); -- GIS Data INSERT INTO "tgis_map" VALUES (1,'Sample',-3.708187,40.42056,0,16,'',-3.708187,40.42056,0,0,1); SELECT setval('tgis_map_id_tgis_map_seq', (SELECT (SELECT MAX(id_tgis_map) FROM tgis_map))); -INSERT INTO "tgis_map_connection" VALUES (1,'OpenStreetMap','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); + +INSERT INTO "tgis_map_connection" VALUES (1,'OpenStreetMap (MapQuest Open)','OSM','{\"type\":\"OSM\",\"url\":\"http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); +INSERT INTO "tgis_map_connection" VALUES (2,'OpenStreetMap (Standard)','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); SELECT setval('tgis_map_connection_id_tmap_connection_seq', (SELECT (SELECT MAX(id_tmap_connection) FROM tgis_map_connection))); + INSERT INTO "tgis_map_has_tgis_map_connection" VALUES (1,1,'2010-03-01 09:46:48',1); INSERT INTO "tgis_map_layer" VALUES (1,'Group All',1,0,1,0); SELECT setval('tgis_map_layer_id_tmap_layer_seq', (SELECT (SELECT MAX(id_tmap_layer) FROM tgis_map_layer))); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index e3d4f14e02..7b94da6fab 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -970,7 +970,8 @@ INSERT INTO `tnetwork_profile_component` VALUES (24,1),(25,1),(27,1),(28,1),(30, -- GIS Data INSERT INTO `tgis_map` VALUES (1,'Sample',-3.708187,40.42056,0,16,'',-3.708187,40.42056,0,0,1); -INSERT INTO `tgis_map_connection` VALUES (1,'OpenStreetMap','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); +INSERT INTO `tgis_map_connection` VALUES (1,'OpenStreetMap (MapQuest Open)','OSM','{\"type\":\"OSM\",\"url\":\"http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); +INSERT INTO `tgis_map_connection` VALUES (2,'OpenStreetMap (Standard)','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0); INSERT INTO `tgis_map_has_tgis_map_connection` VALUES (1,1,'2010-03-01 09:46:48',1); INSERT INTO `tgis_map_layer` VALUES (1,'Group All',1,0,1,0);