Removed unnecessary key that is not required anymore for maps version 3.

alkacon · Jan 10, 2012 · 4ff7e16 · 4ff7e16
1 parent 6edbcc2
commit 4ff7e16
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 43 deletions.
diff --git a/...s.geomap/resources/system/modules/com.alkacon.opencms.geomap/elements/header.include.html b/...s.geomap/resources/system/modules/com.alkacon.opencms.geomap/elements/header.include.html
@@ -1,16 +1,9 @@
 <%@ page session="false" import="org.opencms.main.*, org.opencms.util.*" %><%--
---%><%@ taglib prefix="cms" uri="http://www.opencms.org/taglib/cms" %><%
-
-	String mapKey = OpenCms.getModuleManager().getModule("com.alkacon.opencms.geomap").getParameter("map.key.workplace", "");
-	if (CmsStringUtil.isEmptyOrWhitespaceOnly(mapKey)) {
-		mapKey = OpenCms.getModuleManager().getModule("com.alkacon.opencms.geomap").getParameter("map.key", "");
-	}
-	pageContext.setAttribute("mapkey", mapKey);
-
-%><link type="text/css" rel="stylesheet" href="<cms:link>../resources/fg.menu.css</cms:link>" />
+--%><%@ taglib prefix="cms" uri="http://www.opencms.org/taglib/cms" %>
+<link type="text/css" rel="stylesheet" href="<cms:link>../resources/fg.menu.css</cms:link>" />
 <link type="text/css" rel="stylesheet" href="<cms:link>../resources/fg.button.css</cms:link>" />
 <link type="text/css" rel="stylesheet" href="<cms:link>../resources/map.css</cms:link>" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&key=${mapkey}" ></script>
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false" ></script>
 <script type="text/javascript" src="<cms:link>../resources/fg.menu.js</cms:link>" ></script>
 <script type="text/javascript" src="<cms:link>../resources/jquery.listenForChange.js</cms:link>" ></script>
 <script type="text/javascript" src="<cms:link>../resources/jquery.forms.js</cms:link>" ></script>

diff --git a/com.alkacon.opencms.geomap/resources/system/modules/com.alkacon.opencms.geomap/pages/map.jsp b/com.alkacon.opencms.geomap/resources/system/modules/com.alkacon.opencms.geomap/pages/map.jsp
@@ -45,19 +45,9 @@
 		<c:set var="mapw">width: ${mapw};</c:set>
 	</c:if>
 	<c:set var="maph">height: ${maph};</c:set>
-
-	<%-- get map key from property map.key or module parameter map.key --%>
-	<c:set var="mapkey"><cms:property name="map.key" file="search" default="" /></c:set>
-	<%
-		String mapKey = (String)pageContext.getAttribute("mapkey");
-		if (CmsStringUtil.isEmptyOrWhitespaceOnly(mapKey)) {
-			mapKey = OpenCms.getModuleManager().getModule("com.alkacon.opencms.geomap").getParameter("map.key", "");
-		}
-		pageContext.setAttribute("mapkey", mapKey);
-	%>
 
 	<%-- include Google Maps JS --%>
-	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language=${locale}&key=${mapkey}"></script>
+	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&amp;language=${locale}"></script>
 	<script type="text/javascript">
 		// map object
 		var map;

diff --git a/...idget/resources/system/modules/com.alkacon.opencms.mapwidget/elements/header.include.html b/...idget/resources/system/modules/com.alkacon.opencms.mapwidget/elements/header.include.html
@@ -7,7 +7,7 @@
 <%-- already included in editor: <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" ></script>
                                  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/jquery-ui.min.js" ></script>
 --%><%-- V2: <script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&key=<cms:include file='map.workplace.key' cacheable='true' />" ></script> --%>
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&key=<cms:include file='map.workplace.key' cacheable='true' />" ></script>
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false" ></script>
 <script type="text/javascript" src="<cms:link>../resources/fg.menu.js</cms:link>" ></script>
 <script type="text/javascript" src="<cms:link>../resources/jquery.listenForChange.js</cms:link>" ></script>
 <script type="text/javascript" src="<cms:link>../resources/jquery.forms.js</cms:link>" ></script>

diff --git a/...eomap/resources/system/modules/com.alkacon.opencms.v8.geomap/elements/header.include.html b/...eomap/resources/system/modules/com.alkacon.opencms.v8.geomap/elements/header.include.html
@@ -1,16 +1,9 @@
 <%@ page session="false" import="org.opencms.main.*, org.opencms.util.*" %><%--
---%><%@ taglib prefix="cms" uri="http://www.opencms.org/taglib/cms" %><%
-
-	String mapKey = OpenCms.getModuleManager().getModule("com.alkacon.opencms.v8.geomap").getParameter("map.key.workplace", "");
-	if (CmsStringUtil.isEmptyOrWhitespaceOnly(mapKey)) {
-		mapKey = OpenCms.getModuleManager().getModule("com.alkacon.opencms.v8.geomap").getParameter("map.key", "");
-	}
-	pageContext.setAttribute("mapkey", mapKey);
-
-%><link type="text/css" rel="stylesheet" href="<cms:link>../resources/fg.menu.css</cms:link>" />
+--%><%@ taglib prefix="cms" uri="http://www.opencms.org/taglib/cms" %>
+<link type="text/css" rel="stylesheet" href="<cms:link>../resources/fg.menu.css</cms:link>" />
 <link type="text/css" rel="stylesheet" href="<cms:link>../resources/fg.button.css</cms:link>" />
 <link type="text/css" rel="stylesheet" href="<cms:link>../resources/map.css</cms:link>" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&key=${mapkey}" ></script>
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false" ></script>
 <script type="text/javascript" src="<cms:link>../resources/fg.menu.js</cms:link>" ></script>
 <script type="text/javascript" src="<cms:link>../resources/jquery.listenForChange.js</cms:link>" ></script>
 <script type="text/javascript" src="<cms:link>../resources/jquery.forms.js</cms:link>" ></script>

diff --git a/...on.opencms.v8.geomap/resources/system/modules/com.alkacon.opencms.v8.geomap/pages/map.jsp b/...on.opencms.v8.geomap/resources/system/modules/com.alkacon.opencms.v8.geomap/pages/map.jsp
@@ -45,19 +45,9 @@
 		<c:set var="mapw">width: ${mapw};</c:set>
 	</c:if>
 	<c:set var="maph">height: ${maph};</c:set>
-
-	<%-- get map key from property map.key or module parameter map.key --%>
-	<c:set var="mapkey"><cms:property name="map.key" file="search" default="" /></c:set>
-	<%
-		String mapKey = (String)pageContext.getAttribute("mapkey");
-		if (CmsStringUtil.isEmptyOrWhitespaceOnly(mapKey)) {
-			mapKey = OpenCms.getModuleManager().getModule("com.alkacon.opencms.v8.geomap").getParameter("map.key", "");
-		}
-		pageContext.setAttribute("mapkey", mapKey);
-	%>
 
 	<%-- include Google Maps JS --%>
-	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language=${locale}&key=${mapkey}"></script>
+	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&amp;language=${locale}"></script>
 	<script type="text/javascript">
 		// map object
 		var map;