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:15:33 UTC
svn commit: r1842032 - in /comdev/nearby_people: local_settings.py.example
templates/base_map.html templates/map.html
Author: nick
Date: Wed Sep 26 16:15:33 2018
New Revision: 1842032
URL: http://svn.apache.org/viewvc?rev=1842032&view=rev
Log:
Update the main map for the V3 gmaps API changes
Modified:
comdev/nearby_people/local_settings.py.example
comdev/nearby_people/templates/base_map.html
comdev/nearby_people/templates/map.html
Modified: comdev/nearby_people/local_settings.py.example
URL: http://svn.apache.org/viewvc/comdev/nearby_people/local_settings.py.example?rev=1842032&r1=1842031&r2=1842032&view=diff
==============================================================================
--- comdev/nearby_people/local_settings.py.example (original)
+++ comdev/nearby_people/local_settings.py.example Wed Sep 26 16:15:33 2018
@@ -28,8 +28,8 @@ ALLOWED_HOSTS = [
]
# Google Maps settings
-GMAPS_KEY = "ABQIAAAAteF8gqn96L8K4RRZYtk7ZRQv7OBTi813IEDuwD3BusDViujKIBTUfK-gV5SL7dqLeRkgc0jLmyXgkg" # localhost
-#GMAPS_KEY = "ABQIAAAAKzqK7s3QLJgbVNLowesmvBRZUAEs3HYX8hgK-I5Eho3zsmHV-RQBJhSLW6bIoahGVe1Ap9pWhcewGw" # apache.org
+# Official key managed by ASF Infra
+GMAPS_KEY = ""
# GeoNames settings
# Note - you need your own username, register at http://www.geonames.org/login
Modified: comdev/nearby_people/templates/base_map.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/templates/base_map.html?rev=1842032&r1=1842031&r2=1842032&view=diff
==============================================================================
--- comdev/nearby_people/templates/base_map.html (original)
+++ comdev/nearby_people/templates/base_map.html Wed Sep 26 16:15:33 2018
@@ -3,37 +3,42 @@
{% load emails %}
{% block extrahead %}
-<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" 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" charset="utf-8">
<!--
var markers = [];
var map;
-function createMarker(name,lat,lng,link,projects,avatar,email) {
- var point = new GLatLng(lat,lng);
- var options = { title: name }; // appears when cursor hovers over marker
- var marker = new GMarker(point,options);
- GEvent.addListener(marker, "click", function() {
- var msg = "<h3>" + name + "</h3>";
- if (avatar != "None") {
+function createMarker(map,name,lat,lng,link,projects,avatar,email) {
+ var point = new google.maps.LatLng(lat,lng);
+ var marker = new google.maps.Marker({
+ position: point,
+ title: name, // appears when cursor hovers over marker
+ map: map
+ });
+
+ var msg = "<h3>" + name + "</h3>";
+ if (avatar != "None") {
msg = msg + "<img src='" + avatar + "' alt='Image of " + name + "'/>";
- }
- msg = msg + " <ul>";
- for (var i = 0; i < projects.length; i++) {
+ }
+ msg = msg + " <ul>";
+ for (var i = 0; i < projects.length; i++) {
msg = msg + "<li>" + projects[i] + "</li>";
- };
- msg = msg + " </ul>";
- if (email != "None") {
+ };
+ msg = msg + " </ul>";
+ if (email != "None") {
msg = msg + "<div>Email: <i>" + email + "</i></div>";
- }
- msg = msg + " <a href=\"" + link + "\">" +
- "<small>Info<\/small><\/a>";
- marker.openInfoWindowHtml(msg);
+ }
+ msg = msg + " <a href=\"" + link + "\">" +
+ "<small>Info<\/small><\/a>";
+
+ var infoWindow = new google.maps.InfoWindow({
+ content: msg
+ });
+ marker.addListener("click", function() {
+ infoWindow.open(map, marker);
});
return marker;
Modified: comdev/nearby_people/templates/map.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/templates/map.html?rev=1842032&r1=1842031&r2=1842032&view=diff
==============================================================================
--- comdev/nearby_people/templates/map.html (original)
+++ comdev/nearby_people/templates/map.html Wed Sep 26 16:15:33 2018
@@ -10,37 +10,35 @@
<!--
function global() {
map.setZoom(2);
- map.panTo(new GLatLng(20, 0));
+ map.panTo(new google.maps.LatLng(20, 0));
}
function europe() {
map.setZoom(3);
- map.panTo(new GLatLng(50.000, 5.0000));
+ map.panTo(new google.maps.LatLng(50.000, 5.0000));
}
function namer() {
map.setZoom(3);
- map.panTo(new GLatLng(37.000, -93.0000));
+ map.panTo(new google.maps.LatLng(37.000, -93.0000));
}
function samer() {
map.setZoom(3);
- map.panTo(new GLatLng(-20.000, -65.0000));
+ map.panTo(new google.maps.LatLng(-20.000, -65.0000));
}
function africa() {
map.setZoom(3);
- map.panTo(new GLatLng(0.000, 20.0000));
+ map.panTo(new google.maps.LatLng(0.000, 20.0000));
}
function asia() {
map.setZoom(3);
- map.panTo(new GLatLng(35.000, 102.0000));
+ map.panTo(new google.maps.LatLng(35.000, 102.0000));
}
function aus() {
map.setZoom(3);
- map.panTo(new GLatLng(-25.000, 137.0000));
+ map.panTo(new google.maps.LatLng(-25.000, 137.0000));
}
$(document).ready(function(){
- if (GBrowserIsCompatible()) {
- map = new GMap2(document.getElementById('map'));
- map.addControl(new GLargeMapControl());
+ map = new google.maps.Map(document.getElementById('map'));
global();
// Add our markers
@@ -49,13 +47,11 @@ $(document).ready(function(){
{% for project in person.projects %}
projectNames.push("{{project.name}}");
{% endfor %}
- marker = createMarker("{{person.name}}",{{person.latitude}},
+ marker = createMarker(map, "{{person.name}}",{{person.latitude}},
{{person.longitude}},"{{person.link}}", projectNames,
"{{person.avatar}}","{{person.email|emailformat}}");
- map.addOverlay(marker);
markers["{{person.uid}}"] = marker;
{% endfor %}
- }
});
//-->
</script>