[geodatastore commit] r21 - in trunk: js templates
codesite...@google.com
Date: Fri Aug 22 15:44:27 2008
New Revision: 21
Modified:
trunk/js/admin.js
trunk/js/locator.js
trunk/js/readonly.js
trunk/templates/admin.html
trunk/templates/base.html
trunk/templates/locator.html
trunk/templates/mapdisplay.html
Log:
Changing namespace to be geodatastore, and moving common functions into
common.js
Modified: trunk/js/admin.js
==============================================================================
--- trunk/js/admin.js (original)
+++ trunk/js/admin.js Fri Aug 22 15:44:27 2008
@@ -1,10 +1,4 @@
-if(typeof console == "undefined"){
- var console = {log:function(){}}
-}
-
-var geoserver = {};
-
-geoserver.adminPanel = function(id) {
+geodatastore.adminPanel = function(id) {
this.map_ = null;
this.dom_ = {
wrapper_div: document.getElementById(id),
@@ -16,56 +10,22 @@
this.createMap_();
};
-geoserver.adminPanel.prototype.canUserEdit_ = function(userId) {
+geodatastore.adminPanel.prototype.canUserEdit_ = function(userId) {
return (userId == current_user || is_admin == 'True');
}
-geoserver.adminPanel.prototype.isUserLoggedIn_ = function() {
+geodatastore.adminPanel.prototype.isUserLoggedIn_ = function() {
return current_user != 'Not logged in';
}
-geoserver.adminPanel.prototype.createMap_ = function() {
+geodatastore.adminPanel.prototype.createMap_ = function() {
var me = this;
- var table = document.createElement('table');
- table.style.width = '100%';
- if (window.innerHeight) {
- var height = window.innerHeight - 150;
- } else {
- var height = document.documentElement.offsetHeight - 150;
- }
- height = height + "px";
- var tbody = document.createElement('tbody');
- table.appendChild(tbody);
-
- var tr = document.createElement('tr');
-
- var map_td = document.createElement('td');
- map_td.height = height;
- var map_div = document.createElement('div');
- map_div.style.width = '100%';
- map_div.style.height = '100%';
- map_div.style.border = '1px solid #eeeeee';
- map_td.appendChild(map_div);
-
- var sidebar_td = document.createElement('td');
- sidebar_td.width = '29%';
- sidebar_td.height = height;
- var sidebar_div = document.createElement('div');
- sidebar_div.id = 'sidebar';
- sidebar_div.style.overflow = 'scroll';
- sidebar_div.style.border = '1px solid #eeeeee';
- sidebar_div.style.height = height;
- sidebar_td.appendChild(sidebar_div);
-
- tr.appendChild(map_td);
- tr.appendChild(sidebar_td);
- tbody.appendChild(tr);
+ var created_divs =
geodatastore.createMapWithSidebar(this.dom_.wrapper_div);
+ this.dom_.map_div = created_divs.map_div;
+ this.dom_.sidebar_div = created_divs.sidebar_div;
- this.dom_.wrapper_div.appendChild(table);
- this.dom_.sidebar_div = sidebar_div;
-
- this.map_ = new GMap2(map_div, {googleBarOptions:
+ this.map_ = new GMap2(this.dom_.map_div, {googleBarOptions:
{showOnLoad: true, onGenerateMarkerHtmlCallback : function(marker, html,
result) {
return me.extendMarker_(me, marker, html, result);}}});
this.map_.setCenter(new GLatLng(37, -122));
@@ -136,7 +96,7 @@
this.loadKmlData_();
};
-geoserver.adminPanel.prototype.extendMarker_ = function(gs, marker, html,
result) {
+geodatastore.adminPanel.prototype.extendMarker_ = function(gs, marker,
html, result) {
var me = this;
// extend the passed in html for this result
//
http://code.google.com/apis/ajaxsearch/documentation/reference.html#_class_GlocalResult
@@ -165,7 +125,7 @@
};
-geoserver.adminPanel.prototype.updateHighlightPoly_ = function() {
+geodatastore.adminPanel.prototype.updateHighlightPoly_ = function() {
var me = this;
if (me.highlightPoly_) { me.map_.removeOverlay(me.highlightPoly_); }
if (!me.selected_geometry_) { return; }
@@ -198,7 +158,7 @@
}
-geoserver.adminPanel.prototype.createSidebarEntry_ = function(geometry) {
+geodatastore.adminPanel.prototype.createSidebarEntry_ = function(geometry)
{
var me = this;
var div = document.createElement('div');
div.style.cursor = 'pointer';
@@ -289,7 +249,7 @@
return div;
}
-geoserver.adminPanel.prototype.createTableRow_ = function(label, value,
is_input, geometry) {
+geodatastore.adminPanel.prototype.createTableRow_ = function(label, value,
is_input, geometry) {
var tr = document.createElement('tr');
var label_td = document.createElement('td');
label_td.className = 'view_label';
@@ -313,7 +273,7 @@
return tr;
}
-geoserver.adminPanel.prototype.createView_ = function(geometry,
parent_div) {
+geodatastore.adminPanel.prototype.createView_ = function(geometry,
parent_div) {
var me = this;
var div = document.createElement('div');
@@ -340,7 +300,7 @@
return div;
}
-geoserver.adminPanel.prototype.createForm_ = function(geometry,
parent_div) {
+geodatastore.adminPanel.prototype.createForm_ = function(geometry,
parent_div) {
var me = this;
var div = document.createElement('div');
@@ -408,7 +368,7 @@
return div;
};
-geoserver.adminPanel.prototype.loadKmlData_ = function() {
+geodatastore.adminPanel.prototype.loadKmlData_ = function() {
var me = this;
var url_base = 'gen/';
var url = url_base + 'request?operation=get&output=json'
@@ -416,7 +376,7 @@
GDownloadUrl(url, function(data, responseCode) {
me.handleDataResponse_(me, data, responseCode); });
};
-geoserver.adminPanel.prototype.saveData_ = function(type, data) {
+geodatastore.adminPanel.prototype.saveData_ = function(type, data) {
var url = 'gen/request?';
var url_params = ['operation=' + type];
for (var data_key in data) {
@@ -437,7 +397,7 @@
GDownloadUrl(url, this.handleDataResponse_);
};
-geoserver.adminPanel.prototype.handleDataResponse_ = function(me, data,
responseCode) {
+geodatastore.adminPanel.prototype.handleDataResponse_ = function(me, data,
responseCode) {
if (responseCode == 200) {
var json_data = eval('(' + data + ')');
if (json_data.status != 'success') return;
@@ -463,7 +423,7 @@
};
-geoserver.adminPanel.prototype.createGeometry_ = function(data,
is_editable) {
+geodatastore.adminPanel.prototype.createGeometry_ = function(data,
is_editable) {
var me = this;
data.name = unescape(data.name);
data.description = unescape(data.description);
Modified: trunk/js/locator.js
==============================================================================
--- trunk/js/locator.js (original)
+++ trunk/js/locator.js Fri Aug 22 15:44:27 2008
@@ -1,11 +1,11 @@
//Depends on readonly.js
-geoserver.mapDisplay.prototype.locator_override_createMap_ =
- geoserver.mapDisplay.prototype.createMap_;
+geodatastore.mapDisplay.prototype.locator_override_createMap_ =
+ geodatastore.mapDisplay.prototype.createMap_;
-geoserver.mapDisplay.prototype.loadKmlData_ = function() {};
+geodatastore.mapDisplay.prototype.loadKmlData_ = function() {};
-geoserver.mapDisplay.prototype.createMap_ = function(id) {
+geodatastore.mapDisplay.prototype.createMap_ = function(id) {
var me = this;
if (!this.geocoder_) {
this.geocoder_ = new GClientGeocoder();
@@ -43,7 +43,7 @@
var src = '/locate?lat=' + location.lat();
src += '&lon=' + location.lng();
src += '&num=3&alt=json-in-script';
- src += '&callback=geoserver.mapDisplay.handleLocatorJson';
+ src += '&callback=geodatastore.mapDisplay.handleLocatorJson';
var script = document.createElement('script');
script.setAttribute('src', src);
@@ -56,11 +56,11 @@
});
this.dom_.sidebar_div.appendChild(input_div);
- window.geoserver_object_ = this;
+ window.geodatastore_object_ = this;
};
-geoserver.mapDisplay.handleLocatorJson = function(json) {
- window.geoserver_object_.map_.clearOverlays();
+geodatastore.mapDisplay.handleLocatorJson = function(json) {
+ window.geodatastore_object_.map_.clearOverlays();
var records = json.result.geometries.records;
var bounds = new GLatLngBounds();
for (var i=0; i<records.length; i++) {
@@ -72,10 +72,10 @@
var marker = new GMarker(loc);
marker.bindInfoWindowHtml(records[i].description);
- window.geoserver_object_.map_.addOverlay(marker);
+ window.geodatastore_object_.map_.addOverlay(marker);
}
if (!bounds.isEmpty()) {
- window.geoserver_object_.map_.setCenter(bounds.getCenter());
-
window.geoserver_object_.map_.setZoom(window.geoserver_object_.map_.getBoundsZoomLevel(bounds));
+ window.geodatastore_object_.map_.setCenter(bounds.getCenter());
+
window.geodatastore_object_.map_.setZoom(window.geodatastore_object_.map_.getBoundsZoomLevel(bounds));
}
};
Modified: trunk/js/readonly.js
==============================================================================
--- trunk/js/readonly.js (original)
+++ trunk/js/readonly.js Fri Aug 22 15:44:27 2008
@@ -1,11 +1,4 @@
-var console = console || {};
-console.log = console.log || function(data) { }
-
-if (!geoserver) {
- var geoserver = {};
-}
-
-geoserver.mapDisplay = function(id) {
+geodatastore.mapDisplay = function(id) {
this.map_ = null;
this.dom_ = {
wrapper_div: document.getElementById(id),
@@ -16,31 +9,14 @@
this.createMap_();
};
-geoserver.mapDisplay.prototype.createMap_ = function() {
+geodatastore.mapDisplay.prototype.createMap_ = function() {
var me = this;
- var table = document.createElement('table');
- table.style.width = '100%';
- var tr = document.createElement('tr');
- var map_td = document.createElement('td');
- map_td.width = '70%';
- var map_div = document.createElement('div');
- map_div.style.height = '700px';
- map_div.style.border = '1px solid grey';
- map_td.appendChild(map_div);
- var sidebar_td = document.createElement('td');
- sidebar_td.width = '29%';
- var sidebar_div = document.createElement('div');
- sidebar_div.style.height = '700px';
- sidebar_div.style.overflow = 'auto';
- sidebar_div.style.border = '1px solid grey';
- sidebar_td.appendChild(sidebar_div);
- tr.appendChild(map_td);
- tr.appendChild(sidebar_td);
- table.appendChild(tr);
- this.dom_.wrapper_div.appendChild(table);
- this.dom_.sidebar_div = sidebar_div;
+
+ var created_divs =
geodatastore.createMapWithSidebar(this.dom_.wrapper_div);
+ this.dom_.map_div = created_divs.map_div;
+ this.dom_.sidebar_div = created_divs.sidebar_div;
- this.map_ = new GMap2(map_div);
+ this.map_ = new GMap2(this.dom_.map_div);
this.map_.setCenter(new GLatLng(37, -122));
this.map_.addControl(new GLargeMapControl());
this.map_.addControl(new GMapTypeControl());
@@ -61,7 +37,7 @@
this.loadKmlData_();
};
-geoserver.mapDisplay.prototype.updateHighlightPoly_ = function() {
+geodatastore.mapDisplay.prototype.updateHighlightPoly_ = function() {
var me = this;
if (me.highlightPoly_) { me.map_.removeOverlay(me.highlightPoly_); }
if (!me.selected_geometry_) { return; }
@@ -92,7 +68,7 @@
me.map_.addOverlay(me.highlightPoly_);
};
-geoserver.mapDisplay.prototype.createSidebarEntry_ = function(geometry) {
+geodatastore.mapDisplay.prototype.createSidebarEntry_ = function(geometry)
{
var me = this;
var div = document.createElement('div');
div.style.cursor = 'pointer';
@@ -105,7 +81,7 @@
return div;
};
-geoserver.mapDisplay.prototype.createTableRow_ = function(label, value,
is_input, geometry) {
+geodatastore.mapDisplay.prototype.createTableRow_ = function(label, value,
is_input, geometry) {
var tr = document.createElement('tr');
var label_td = document.createElement('td');
label_td.className = 'view_label';
@@ -125,7 +101,7 @@
return tr;
};
-geoserver.mapDisplay.prototype.createView_ = function(geometry,
parent_div) {
+geodatastore.mapDisplay.prototype.createView_ = function(geometry,
parent_div) {
var me = this;
var div = document.createElement('div');
@@ -138,7 +114,7 @@
return div;
};
-geoserver.mapDisplay.prototype.loadKmlData_ = function() {
+geodatastore.mapDisplay.prototype.loadKmlData_ = function() {
var me = this;
var url_base = 'gen/';
var url = url_base + 'request?operation=get&output=json';
@@ -146,7 +122,7 @@
};
-geoserver.mapDisplay.prototype.handleDataResponse_ = function(me, data,
responseCode) {
+geodatastore.mapDisplay.prototype.handleDataResponse_ = function(me, data,
responseCode) {
if (responseCode == 200) {
var json_data = eval('(' + data + ')');
if (json_data.status != 'success') return;
@@ -172,11 +148,11 @@
};
-geoserver.mapDisplay.prototype.createGeometry_ = function(data,
is_editable) {
+geodatastore.mapDisplay.prototype.createGeometry_ = function(data,
is_editable) {
var me = this;
if (data.type == 'point') {
var geometry = new GMarker(new GLatLng(data.coordinates[0].lat,
- data.coordinates[0].lng), {draggable: true, icon: me.icon_});
+ data.coordinates[0].lng), {icon: me.icon_});
} else if (data.type == 'line' || data.type == 'poly') {
var latlngs = [];
for (var i = 0; i < data.coordinates.length; i++) {
@@ -195,9 +171,8 @@
GEvent.addListener(geometry, 'click', function() {
me.selected_geometry_ = geometry;
me.updateHighlightPoly_();
- // GEvent.trigger(geometry.sidebar_entry, 'enableedit');
});
return geometry;
};
-
\ No newline at end of file
+
Modified: trunk/templates/admin.html
==============================================================================
--- trunk/templates/admin.html (original)
+++ trunk/templates/admin.html Fri Aug 22 15:44:27 2008
@@ -5,7 +5,7 @@
<script type="text/javascript" src="js/admin.js"></script>
<script type="text/javascript">
window.onload = function() {
- new geoserver.adminPanel('mapPanel')
+ new geodatastore.adminPanel('mapPanel')
}
</script>
{% endblock %}
Modified: trunk/templates/base.html
==============================================================================
--- trunk/templates/base.html (original)
+++ trunk/templates/base.html Fri Aug 22 15:44:27 2008
@@ -4,6 +4,7 @@
<head>
<title>{{ title }}</title>
<link rel="stylesheet" type="text/css" href="css/geoserver.css"
media="all"/>
+ <script type="text/javascript" src="js/common.js"></script>
{% block scripts %}
{% endblock %}
<script type="text/javascript">
Modified: trunk/templates/locator.html
==============================================================================
--- trunk/templates/locator.html (original)
+++ trunk/templates/locator.html Fri Aug 22 15:44:27 2008
@@ -6,7 +6,7 @@
<script type="text/javascript" src="js/locator.js"></script>
<script type="text/javascript">
window.onload = function() {
- new geoserver.mapDisplay('mapPanel')
+ new geodatastore.mapDisplay('mapPanel')
}
</script>
{% endblock %}
Modified: trunk/templates/mapdisplay.html
==============================================================================
--- trunk/templates/mapdisplay.html (original)
+++ trunk/templates/mapdisplay.html Fri Aug 22 15:44:27 2008
@@ -5,7 +5,7 @@
<script type="text/javascript" src="js/readonly.js"></script>
<script type="text/javascript">
window.onload = function() {
- new geoserver.mapDisplay('mapPanel')
+ new geodatastore.mapDisplay('mapPanel')
}
</script>
{% endblock %}