diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7590f3a30c..ebe4974ad0 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-03-01 Miguel de Dios + + * pandoradb_data.sql: add the default map from Open street map, and set + active by default the GIS. + + * godmode/setup/gis_step_2.php: fix tiny bugs in the form that the default + values for zooms were exchangeds. + 2010-02-25 Miguel de Dios * include/functions_gis.php: use zoom level. diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php index 4fb3eb1b53..787f4c603e 100755 --- a/pandora_console/godmode/setup/gis_step_2.php +++ b/pandora_console/godmode/setup/gis_step_2.php @@ -39,8 +39,8 @@ switch ($action) { echo __('Create new map connection').""; $mapConnection_name = ''; $mapConnection_group = ''; - $mapConnection_numLevelsZoom = '16'; - $mapConnection_defaultZoom = '19'; + $mapConnection_numLevelsZoom = '19'; + $mapConnection_defaultZoom = '16'; $mapConnection_type = 0; $mapConnection_defaultLatitude = '40.42056'; $mapConnection_defaultLongitude = '-3.708187'; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index eed9139641..35b2e7ba48 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -64,9 +64,8 @@ INSERT INTO `tconfig` VALUES (26, 'prominent_time', 0), (27, 'timesource', 'system'), (28, 'realtimestats', '1'), -(29, 'stats_interval', '300'); - -INSERT INTO tconfig (`token`, `value`) VALUES ('activate_gis', '0'); +(29, 'stats_interval', '300'), +(30, 'activate_gis', '1'); UNLOCK TABLES; @@ -372,3 +371,8 @@ INSERT INTO `tnetwork_profile_component` (`id_nc`, `id_np`) VALUES (201,6); 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,1,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,1); +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,1);