[Commits] r2188 - in sandbox/cmoullet/ux: ReverseGeocoder/examples RoutingPanel/examples RoutingPanel/tests/ux/widgets RoutingPanel/ux/widgets
commits at geoext.org
commits at geoext.org
Thu May 13 06:25:24 CEST 2010
Author: cmoullet
Date: 2010-05-13 06:25:24 +0200 (Thu, 13 May 2010)
New Revision: 2188
Modified:
sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.html
sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.js
sandbox/cmoullet/ux/RoutingPanel/examples/RoutingPanelExample.html
sandbox/cmoullet/ux/RoutingPanel/tests/ux/widgets/RoutingPanel.html
sandbox/cmoullet/ux/RoutingPanel/ux/widgets/RoutingPanel.js
Log:
Fix path to geonames
Modified: sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.html
===================================================================
--- sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.html 2010-05-13 04:18:24 UTC (rev 2187)
+++ sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.html 2010-05-13 04:25:24 UTC (rev 2188)
@@ -27,7 +27,7 @@
<script type="text/javascript" src="http://openlayers.org/api/2.8/OpenLayers.js"></script>
<script type="text/javascript" src="../../../trunk/geoext/lib/GeoExt.js"></script>
- <script type="text/javascript" src="http://svn.geoext.org/extensions/geoext.ux/ux/GeoNamesSearchCombo/lib/GeoExt.ux.geonames/GeoNamesSearchCombo.js"></script>
+ <script type="text/javascript" src="http://svn.geoext.org/extensions/geoext.ux/ux/GeoNamesSearchCombo/lib/GeoExt.ux/GeoNamesSearchCombo.js"></script>
<script type="text/javascript" src="../ux/control/ReverseGeocoderClick.js"></script>
Modified: sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.js
===================================================================
--- sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.js 2010-05-13 04:18:24 UTC (rev 2187)
+++ sandbox/cmoullet/ux/ReverseGeocoder/examples/ReverseGeocoderExample.js 2010-05-13 04:25:24 UTC (rev 2188)
@@ -53,7 +53,7 @@
enableDD: true
});
- var geoNameSearchCombo = new GeoExt.ux.geonames.GeoNamesSearchCombo({
+ var geoNameSearchCombo = new GeoExt.ux.GeoNamesSearchCombo({
map: map,
zoom: 16
});
Modified: sandbox/cmoullet/ux/RoutingPanel/examples/RoutingPanelExample.html
===================================================================
--- sandbox/cmoullet/ux/RoutingPanel/examples/RoutingPanelExample.html 2010-05-13 04:18:24 UTC (rev 2187)
+++ sandbox/cmoullet/ux/RoutingPanel/examples/RoutingPanelExample.html 2010-05-13 04:25:24 UTC (rev 2188)
@@ -8,9 +8,9 @@
<script type="text/javascript" src="../../../trunk/openlayers/lib/OpenLayers.js"></script>
<script type="text/javascript" src="../../../trunk/geoext/lib/GeoExt.js"></script>
<script type="text/javascript"
- src="http://svn.geoext.org/extensions/geoext.ux/ux/GeoNamesSearchCombo/lib/GeoExt.ux.geonames/GeoNamesSearchCombo.js"></script>
+ src="http://svn.geoext.org/extensions/geoext.ux/ux/GeoNamesSearchCombo/lib/GeoExt.ux/GeoNamesSearchCombo.js"></script>
<script type="text/javascript"
- src="http://svn.geoext.org/sandbox/cmoullet/ux/OpenAddressesSearchCombo/lib/GeoExt.ux.openaddresses/OpenAddressesSearchCombo.js"></script>
+ src="http://svn.geoext.org/sandbox/cmoullet/ux/OpenAddressesSearchCombo/lib/GeoExt.ux/OpenAddressesSearchCombo.js"></script>
<script type="text/javascript" src="../ux/widgets/RoutingPanel.js"></script>
<script type="text/javascript" src="RoutingPanelExample.js"></script>
</head>
Modified: sandbox/cmoullet/ux/RoutingPanel/tests/ux/widgets/RoutingPanel.html
===================================================================
--- sandbox/cmoullet/ux/RoutingPanel/tests/ux/widgets/RoutingPanel.html 2010-05-13 04:18:24 UTC (rev 2187)
+++ sandbox/cmoullet/ux/RoutingPanel/tests/ux/widgets/RoutingPanel.html 2010-05-13 04:25:24 UTC (rev 2188)
@@ -8,7 +8,7 @@
<script type="text/javascript" src="http://openlayers.org/api/2.8/OpenLayers.js"></script>
<script type="text/javascript" src="../../../../../trunk/geoext/lib/GeoExt.js"></script>
<script type="text/javascript"
- src="http://svn.geoext.org/extensions/geoext.ux/ux/GeoNamesSearchCombo/lib/GeoExt.ux.geonames/GeoNamesSearchCombo.js"></script>
+ src="http://svn.geoext.org/extensions/geoext.ux/ux/GeoNamesSearchCombo/lib/GeoExt.ux/GeoNamesSearchCombo.js"></script>
<script type="text/javascript" src="../../../ux/widgets/RoutingPanel.js"></script>
<script type="text/javascript">
function test_ctor(t) {
Modified: sandbox/cmoullet/ux/RoutingPanel/ux/widgets/RoutingPanel.js
===================================================================
--- sandbox/cmoullet/ux/RoutingPanel/ux/widgets/RoutingPanel.js 2010-05-13 04:18:24 UTC (rev 2187)
+++ sandbox/cmoullet/ux/RoutingPanel/ux/widgets/RoutingPanel.js 2010-05-13 04:25:24 UTC (rev 2188)
@@ -358,7 +358,7 @@
// Create geonames search combo
if (this.geocodingType == 'geonames') {
- this.startLocationCombo = new GeoExt.ux.geonames.GeoNamesSearchCombo({
+ this.startLocationCombo = new GeoExt.ux.GeoNamesSearchCombo({
fieldLabel: OpenLayers.i18n('A'),
emptyText: OpenLayers.i18n('Search location in Geonames'),
loadingText: OpenLayers.i18n('Search in Geonames...'),
@@ -375,7 +375,7 @@
);
- this.endLocationCombo = new GeoExt.ux.geonames.GeoNamesSearchCombo({
+ this.endLocationCombo = new GeoExt.ux.GeoNamesSearchCombo({
fieldLabel: OpenLayers.i18n('B'),
emptyText: OpenLayers.i18n('Search location in Geonames'),
loadingText: OpenLayers.i18n('Search in Geonames...'),
@@ -780,10 +780,14 @@
var googleLinks = '<a href="http://maps.google.com/maps?source=s_d&saddr=' + this.startLocationCombo.locationString + '&daddr=' + this.endLocationCombo.locationString + '&dirflg=a" target="new">' + OpenLayers.i18n('Google Itinerary by car') + '</a><br><a href="http://maps.google.com/maps?source=s_d&saddr=' + this.startLocationCombo.locationString + '&daddr=' + this.endLocationCombo.locationString + '&dirflg=r" target="new">' + OpenLayers.i18n('Google Itinerary by public transport') + '</a><br><a href="http://maps.google.com/maps?source=s_d&saddr=' + this.startLocationCombo.locationString + '&daddr=' + this.endLocationCombo.locationString + '&dirflg=w" target="new">' + OpenLayers.i18n('Google Itinerary on foot') + '</a>';
}
this.routingResultPanel.html = OpenLayers.i18n('Total length: ') + Math.round(this.routingRouteSummaryCloudmade.total_distance / 1000) + ' [km]<br>' + googleLinks;
- this.routingResultPanel.body.update(this.routingResultPanel.html);
+ if (this.routingResultPanel.body) {
+ this.routingResultPanel.body.update(this.routingResultPanel.html);
+ }
} else {
this.routingResultPanel.html = this.routingStatusMessageCloudmade;
- this.routingResultPanel.body.update(this.routingResultPanel.html);
+ if (this.routingResultPanel.body) {
+ this.routingResultPanel.body.update(this.routingResultPanel.html);
+ }
}
this.fireEvent('routingcomputed', this);
}, this);
More information about the Commits
mailing list