diff -urN -x germany32 -x '*.rej' -x '*.orig' /scrloc/lipp/geo/geograph_web.7d/local/libs/geograph/rastermap.class.php /scrloc/lipp/geo/geograph_web.7d.new/local/libs/geograph/rastermap.class.php --- /scrloc/lipp/geo/geograph_web.7d/local/libs/geograph/rastermap.class.php 2008-10-15 13:08:42.000000000 +0200 +++ /scrloc/lipp/geo/geograph_web.7d.new/local/libs/geograph/rastermap.class.php 2008-10-15 13:08:53.000000000 +0200 @@ -123,7 +123,7 @@ $this->service = 'VoB'; } } elseif(($this->exactPosition || in_array('Grid',$services)) && in_array('Google',$services)) { - //$this->enabled = true; + #$this->enabled = true; ##FIXME $this->service = 'Google'; } if (isset($this->tilewidth[$this->service])) { @@ -419,15 +419,25 @@ } } - function getPolyLineBlock(&$conv,$e1,$n1,$e2,$n2) { + function getPolyLineBlock(&$conv,$e1,$n1,$e2,$n2,$op=1) { list($lat1,$long1) = $conv->national_to_wgs84($e1,$n1,$this->reference_index); list($lat2,$long2) = $conv->national_to_wgs84($e2,$n2,$this->reference_index); return " var polyline = new GPolyline([ new GLatLng($lat1,$long1), new GLatLng($lat2,$long2) - ], \"#0000FF\", 1); + ], \"#0000FF\", 1, $op); map.addOverlay(polyline);\n"; } + +# function getPolyLineBlock(&$conv,$e1,$n1,$e2,$n2) { +# list($lat1,$long1) = $conv->national_to_wgs84($e1,$n1,$this->reference_index); +# list($lat2,$long2) = $conv->national_to_wgs84($e2,$n2,$this->reference_index); +# return " var polyline = new GPolyline([ +# new GLatLng($lat1,$long1), +# new GLatLng($lat2,$long2) +# ], \"#0000FF\", 1); +# map.addOverlay(polyline);\n"; +# } function getPolySquareBlock(&$conv,$e1,$n1,$e2,$n2) { list($lat1,$long1) = $conv->national_to_wgs84($e1,$n1,$this->reference_index); @@ -499,8 +509,19 @@ map.addOverlay(createMarker(point2));\n"; } if ($this->issubmit) { + $zoom=13; + } else { + $zoom=14; + } + if ($this->issubmit) { $block .= $this->getPolySquareBlock($conv,$e-800,$n-600,$e-200,$n-100); } + if ($this->issubmit) { + for ($i=100; $i<=900; $i+=100) { + $block .= $this->getPolyLineBlock($conv,$e, $n+$i,$e+1000,$n+$i, 0.25); + $block .= $this->getPolyLineBlock($conv,$e+$i,$n, $e+$i, $n+1000, 0.25); + } + } if (empty($this->lat)) { list($this->lat,$this->long) = $conv->national_to_wgs84($this->nateastings,$this->natnorthings,$this->reference_index); } @@ -527,9 +548,10 @@ map.addMapType(G_PHYSICAL_MAP); map.addControl(new GSmallZoomControl()); map.addControl(new GMapTypeControl(true)); - map.disableDragging(); + //map.disableDragging(); var point = new GLatLng({$this->lat},{$this->long}); - map.setCenter(point, 13, G_PHYSICAL_MAP); + //map.setCenter(point, 13, G_PHYSICAL_MAP); + map.setCenter(point, $zoom, G_SATELLITE_MAP); $block AttachEvent(window,'unload',GUnload,false);