You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by ni...@apache.org on 2018/09/26 16:50:31 UTC
svn commit: r1842035 - in /comdev/nearby_people/templates: base_map.html
people.html pick_place.html years_map.html
Author: nick
Date: Wed Sep 26 16:50:30 2018
New Revision: 1842035
URL: http://svn.apache.org/viewvc?rev=1842035&view=rev
Log:
Futher google maps v3 updates
Modified:
comdev/nearby_people/templates/base_map.html
comdev/nearby_people/templates/people.html
comdev/nearby_people/templates/pick_place.html
comdev/nearby_people/templates/years_map.html
Modified: comdev/nearby_people/templates/base_map.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/templates/base_map.html?rev=1842035&r1=1842034&r2=1842035&view=diff
==============================================================================
--- comdev/nearby_people/templates/base_map.html (original)
+++ comdev/nearby_people/templates/base_map.html Wed Sep 26 16:50:30 2018
@@ -3,8 +3,10 @@
{% load emails %}
{% block extrahead %}
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?key={{gmaps_key}}"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+<script type="text/javascript"
+ src="//maps.googleapis.com/maps/api/js?key={{gmaps_key}}"></script>
+<script type="text/javascript"
+ src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
<!--
@@ -48,8 +50,9 @@ function showDetail(uid) {
if (map.getZoom() < 9) {
map.setZoom(9);
}
- map.panTo(markers[uid].getPoint())
- GEvent.trigger(markers[uid], "click");
+ map.panTo(markers[uid].position);
+
+ google.maps.event.trigger(markers[uid], "click");
}
//-->
</script>
Modified: comdev/nearby_people/templates/people.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/templates/people.html?rev=1842035&r1=1842034&r2=1842035&view=diff
==============================================================================
--- comdev/nearby_people/templates/people.html (original)
+++ comdev/nearby_people/templates/people.html Wed Sep 26 16:50:30 2018
@@ -9,43 +9,36 @@
<script type="text/javascript" charset="utf-8">
<!--
$(document).ready(function(){
- if (GBrowserIsCompatible()) {
- map = new GMap2(document.getElementById('map'));
- map.addControl(new GLargeMapControl());
- map.setCenter(new GLatLng({{center_lat}}, {{center_long}}), 14);
+ map = new google.maps.Map(document.getElementById('map'));
+ var bounds = new google.maps.LatLngBounds();
- // Zoom to roughly the right place
- map.panTo(new GLatLng( {{center_lat}}, {{center_long}} ));
- map.setZoom(
- map.getBoundsZoomLevel(new GLatLngBounds(
- new GLatLng( {{bl_lat}} - 0.05, {{bl_long}} - 0.05 ),
- new GLatLng( {{tr_lat}} + 0.05, {{tr_long}} + 0.05 )
- ))
- );
+ // Zoom to roughly the right place
+ map.panTo(new google.maps.LatLng( {{center_lat}}, {{center_long}} ));
+ map.setZoom(10);
- // Add our markers
- {% for dist, person in people %}
- var projectNames = new Array();
- {% for project in person.projects %}
- projectNames.push("{{project.name}}");
- {% endfor %}
- marker = createMarker("{{person.name}}",{{person.latitude}},
- {{person.longitude}},"{{person.link}}", projectNames,
- "{{person.avatar}}","{{person.email|emailformat}}");
- map.addOverlay(marker);
- markers["{{person.uid}}"] = marker;
- {% endfor %}
+ // Add our markers
+ {% for dist, person in people %}
+ var projectNames = new Array();
+ {% for project in person.projects %}
+ projectNames.push("{{project.name}}");
+ {% endfor %}
+ marker = createMarker(map, "{{person.name}}",{{person.latitude}},
+ {{person.longitude}},"{{person.link}}", projectNames,
+ "{{person.avatar}}","{{person.email|emailformat}}");
+ markers["{{person.uid}}"] = marker;
+ bounds.extend(marker.position);
+ {% endfor %}
- // Add the search marker
- search_icon = new GIcon(G_DEFAULT_ICON);
- search_icon.image = "http://www.google.com/intl/en_us/mapfiles/ms/icons/green-dot.png";
- search_icon.iconSize = GSize(32,32);
- search_point = new GMarker(
- new GLatLng({{location.latitude}},{{location.longitude}}),
- search_icon, false
- );
- map.addOverlay(search_point);
- }
+ // Fit to the things we drew
+ map.fitBounds(bounds);
+
+ // Add the search marker
+ var search_point = new google.maps.Marker({
+ position: new google.maps.LatLng({{location.latitude}},{{location.longitude}}),
+ map: map,
+ icon: "http://www.google.com/intl/en_us/mapfiles/ms/icons/green-dot.png",
+ title: "Search location"
+ });
});
//-->
</script>
Modified: comdev/nearby_people/templates/pick_place.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/templates/pick_place.html?rev=1842035&r1=1842034&r2=1842035&view=diff
==============================================================================
--- comdev/nearby_people/templates/pick_place.html (original)
+++ comdev/nearby_people/templates/pick_place.html Wed Sep 26 16:50:30 2018
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_map.html" %}
{% block title %}Select a location{% endblock %}
{% block heading %}Select a location{% endblock %}
@@ -22,23 +22,23 @@ places[{{forloop.counter0}}] = {
{% endfor %}
function drawMaps() {
- if (GBrowserIsCompatible()) {
- for(var i in places) {
- var p = places[i];
- var div = document.getElementById(p['id']);
-
- div.style.display = "block";
- div.parentNode.style.marginBottom = "35px";
-
- var map = new GMap2(div);
- map.setCenter(new GLatLng(p['lat'], p['lng']), 8);
-
- var m = new GMarker(
- new GLatLng(p['lat'], p['lng']),
- {title: p['name']}
- );
- map.addOverlay(m);
- }
+ for(var i in places) {
+ var p = places[i];
+ var div = document.getElementById(p['id']);
+
+ div.style.display = "block";
+ div.parentNode.style.marginBottom = "35px";
+
+ var place = new google.maps.LatLng(p['lat'], p['lng']);
+ var map = new google.maps.Map(div);
+ map.setZoom(8);
+ map.panTo(place);
+
+ var m = new google.maps.Marker({
+ position: place,
+ title: p['name'],
+ map: map
+ });
}
}
</script>
@@ -67,11 +67,6 @@ function drawMaps() {
</p>
</form>
-<script type="text/javascript" src="http://www.google.com/jsapi?key={{gmaps_key}}"></script>
-<script type="text/javascript" charset="utf-8">
- google.load("maps", "2.x");
- google.load("jquery", "1.3.1");
-</script>
<script type="text/javascript" charset="utf-8">
var t;
$(document).ready(function(){
Modified: comdev/nearby_people/templates/years_map.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/templates/years_map.html?rev=1842035&r1=1842034&r2=1842035&view=diff
==============================================================================
--- comdev/nearby_people/templates/years_map.html (original)
+++ comdev/nearby_people/templates/years_map.html Wed Sep 26 16:50:30 2018
@@ -10,28 +10,23 @@
<!--
var years = {};
$(document).ready(function(){
- if (GBrowserIsCompatible()) {
- map = new GMap2(document.getElementById('map'));
- map.addControl(new GLargeMapControl());
+ map = new google.maps.Map(document.getElementById('map'));
- map.setZoom(2);
- map.panTo(new GLatLng(20, 0));
+ map.setZoom(2);
+ map.panTo(new google.maps.LatLng(20, 0));
- // Add our markers
- {% for person in people %}
- var projectNames = new Array();
- {% for project in person.projects %}
- projectNames.push("{{project.name}}");
- {% endfor %}
- marker = createMarker("{{person.name}}",{{person.latitude}},
+ // Add our markers
+ {% for person in people %}
+ var projectNames = new Array();
+ {% for project in person.projects %}
+ projectNames.push("{{project.name}}");
+ {% endfor %}
+ marker = createMarker(map, "{{person.name}}",{{person.latitude}},
{{person.longitude}},"{{person.link}}", projectNames,
"{{person.avatar}}","{{person.email|emailformat}}");
- marker.onMap = true;
- map.addOverlay(marker);
- markers["{{person.uid}}"] = marker;
- years["{{person.uid}}"] = {{person.year}};
- {% endfor %}
- }
+ markers["{{person.uid}}"] = marker;
+ years["{{person.uid}}"] = {{person.year}};
+ {% endfor %}
var sliderUpdate = function() {
// Update the year display