Index: /extensions/rv_gmaps/trunk/admin/admin_config.php
===================================================================
--- /extensions/rv_gmaps/trunk/admin/admin_config.php (revision 23082)
+++ /extensions/rv_gmaps/trunk/admin/admin_config.php (revision 23083)
@@ -44,4 +44,6 @@
$gm_config['marker_icon'] = $_POST['marker_icon'];
+ $gm_config['map_type'] = $_POST['map_type'];
+
mkgetdir( dirname(rvm_get_config_file_name()) );
$fp = fopen( rvm_get_config_file_name(), 'w');
@@ -60,4 +62,5 @@
'NB_MARKERS' => rvm_get_config_var('nb_markers',40),
'NB_IMAGES_PER_MARKER' => rvm_get_config_var('nb_images_per_marker',20),
+ 'MAP_TYPE' => rvm_get_config_var('map_type','ROADMAP'),
)
);
@@ -84,6 +87,13 @@
);
}
+
$template->assign('selected_marker_icon', rvm_get_config_var('marker_icon', '') );
-
+$map_types = array(
+ "ROADMAP" => "Roadmap (Default)",
+ "SATELLITE" => "Satellite",
+ "HYBRID" => "Hybrid",
+ "TERRAIN" => "Terrain",
+);
+$template->assign('map_types', $map_types);
?>
Index: /extensions/rv_gmaps/trunk/admin/admin_config.tpl
===================================================================
--- /extensions/rv_gmaps/trunk/admin/admin_config.tpl (revision 23082)
+++ /extensions/rv_gmaps/trunk/admin/admin_config.tpl (revision 23083)
@@ -55,4 +55,13 @@
+
+
+
+
Index: /extensions/rv_gmaps/trunk/changelog.txt
===================================================================
--- /extensions/rv_gmaps/trunk/changelog.txt (revision 23082)
+++ /extensions/rv_gmaps/trunk/changelog.txt (revision 23083)
@@ -1,2 +1,8 @@
+2.5.c
+- admin can choose default map type (roadmap, satellite, ...)
+- auto center and zoom when viewing map for the entire gallery
+- fix kml namespace
+- attempt to fix uage with https on the photo page (need test)
+
2.5.b
- more forgiving about some wrong exif gps formatting
Index: /extensions/rv_gmaps/trunk/include/picture_map.inc.php
===================================================================
--- /extensions/rv_gmaps/trunk/include/picture_map.inc.php (revision 23082)
+++ /extensions/rv_gmaps/trunk/include/picture_map.inc.php (revision 23083)
@@ -34,4 +34,5 @@
$template->assign(
array(
+ 'MAP_TYPE' => rvm_get_config_var('map_type', 'ROADMAP'),
'U_NO_MAP' => duplicate_picture_url(),
'U_BLOWUP' => rvm_make_blowup_url( array('ll'=>$picture), array('start','box') ),
Index: /extensions/rv_gmaps/trunk/main.inc.php
===================================================================
--- /extensions/rv_gmaps/trunk/main.inc.php (revision 23082)
+++ /extensions/rv_gmaps/trunk/main.inc.php (revision 23083)
@@ -1,5 +1,5 @@
get_pwg_charset(),
'RVM_PLUGIN_VERSION' => RVM_PLUGIN_VERSION,
- 'GMAPS_API_KEY' => $conf['gmaps_api_key'],
'PLUGIN_ROOT_URL' => get_absolute_root_url().'plugins/'.$rvm_dir,
'PLUGIN_LOCATION' => 'plugins/'.$rvm_dir,
@@ -76,4 +75,5 @@
'U_HOME' => make_index_url(),
'U_HOME_MAP' => rvm_make_map_index_url(),
+ 'MAP_TYPE' => rvm_get_config_var('map_type', 'ROADMAP'),
)
);
Index: /extensions/rv_gmaps/trunk/template/earth_kml.tpl
===================================================================
--- /extensions/rv_gmaps/trunk/template/earth_kml.tpl (revision 23082)
+++ /extensions/rv_gmaps/trunk/template/earth_kml.tpl (revision 23083)
@@ -1,4 +1,4 @@
-
+