Merge pull request #149 from labordep/dev-projections

Better tiles render and webmercator projection

Author: LabordePierre

src/GeoView-Examples/GeoViewBench.class.st

@@ -0,0 +1,45 @@
+"
+I am a bench class to test performances
+"
+Class {
+	#name : #GeoViewBench,
+	#superclass : #Object,
+	#category : #'GeoView-Examples'
+}
+
+{ #category : #projections }
+GeoViewBench class >> timeToProjectCoordinates [
+	"Transform coordinates is several projections and return the result is an array"
+
+	<script>
+	| absoluteCoordinatesList projections results |
+	absoluteCoordinatesList := (1 to: 1000000) collect: [ :i |
+		                           AbsoluteCoordinates random ].
+	projections := {
+		               GeoViewMercatorProjection new.
+		               GeoViewWebMercatorProjection new.
+		               GeoViewUTMProjection new }.
+	results := Dictionary new.
+
+	"project"
+	projections do: [ :proj |
+			| time cartesianCoordinatesList |
+			cartesianCoordinatesList := OrderedCollection new.
+			"first => projection from lat lon to cart"
+			time := [
+				        cartesianCoordinatesList :=
+					        (absoluteCoordinatesList collect: [ :coord |
+						         proj projLatLonToCart: coord ]) ] timeToRunWithoutGC.
+			"second => projection from cart to lat lon"
+			time := time + [
+			        cartesianCoordinatesList do: [ :coord |
+				       coord ifNotNil:[ proj projCartToLatLon: coord ] ] ] timeToRunWithoutGC.
+			results at: proj printString put: time ].
+
+	"show result"
+	results inspect
+]
+
+{ #category : #'see class side' }
+GeoViewBench >> seeClassSide [ 
+]

src/GeoView-Examples/GeoViewExamples.class.st

@@ -235,10 +235,11 @@ GeoViewExamples class >> createTissotIndicatorCircles [
 
 	i := 1.
 	-70 to: 70 by: 15 do:[ :lat | 
-		-180 to: 180 by: 15 do:[ :lon | 
+		-180 to: 180 by: 15 do:[ :lon | | coordinates |
+			coordinates := ( lat @ lon ) asAbsoluteCoordinates.
 			circles add: (GeoCircle new key: i;
-				absoluteCoordinates: ( lat @ lon ) asAbsoluteCoordinates ;
-				fillStyle: (Color green alpha: 0.5) asSmockFillStyle;
+				absoluteCoordinates: coordinates ;
+				fillStyle: (Color green alpha: 0.25) asSmockFillStyle;
 				strokeStyle: (Color green asSmockStrokeStyle width: 1);
 				radiusInMeters: radiusInM;
 				yourself).
@@ -636,19 +637,18 @@ GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingGoogleHybrid [
 { #category : #'examples - tiles provider' }
 GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingGoogleRoadmap [
 	"This example show a map layer (assuming an internet connection to default url of google"
-	
+
 	| element layer |
 	element := GeoViewElement new.
-	
-	element maxScaleInMeters: element maxScaleInMeters * 8.
-	
+
+	element maxScale: element maxScale * 8.
+
 	"add carto layer"
 	layer := GeoViewMapTilesLayer newWithGoogle name: 'Tiles Layer'.
 	layer tilesProvider beRoadmapType.
 	element addLayer: layer.
 
 	^ self openViewInWindow: element
-	
 ]
 
 { #category : #'examples - tiles provider' }
@@ -658,7 +658,7 @@ GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingGoogleRoadsOnly [
 	| element layer |
 	element := GeoViewElement new.
 
-	element maxScaleInMeters: element maxScale * 8.
+	element maxScale: element maxScale * 8.
 
 	"add carto layer"
 	layer := GeoViewMapTilesLayer newWithGoogle name: 'Tiles Layer'.
@@ -671,54 +671,51 @@ GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingGoogleRoadsOnly [
 { #category : #'examples - tiles provider' }
 GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingGoogleSatellite [
 	"This example show a map layer (assuming an internet connection to default url of google"
-	
+
 	| element layer |
 	element := GeoViewElement new.
-	
-	element maxScaleInMeters: element maxScaleInMeters * 8.
-	
+
+	element maxScale: element maxScale * 8.
+
 	"add carto layer"
 	layer := GeoViewMapTilesLayer newWithGoogle name: 'Tiles Layer'.
 	element addLayer: layer.
 
 	^ self openViewInWindow: element
-	
 ]
 
 { #category : #'examples - tiles provider' }
 GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingGoogleTerrain [
 	"This example show a map layer (assuming an internet connection to default url of google"
-	
+
 	| element layer |
 	element := GeoViewElement new.
-	
-	element maxScaleInMeters: element maxScaleInMeters * 8.
-	
+
+	element maxScale: element maxScale * 8.
+
 	"add carto layer"
 	layer := GeoViewMapTilesLayer newWithGoogle name: 'Tiles Layer'.
 	layer tilesProvider beTerrainType.
 	element addLayer: layer.
 
 	^ self openViewInWindow: element
-	
 ]
 
 { #category : #'examples - tiles provider' }
 GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingGoogleTerrainOnly [
 	"This example show a map layer (assuming an internet connection to default url of google"
-	
+
 	| element layer |
 	element := GeoViewElement new.
-	
-	element maxScaleInMeters: element maxScaleInMeters * 8.
-	
+
+	element maxScale: element maxScale * 8.
+
 	"add carto layer"
 	layer := GeoViewMapTilesLayer newWithGoogle name: 'Tiles Layer'.
 	layer tilesProvider beTerrainOnlyType.
 	element addLayer: layer.
 
 	^ self openViewInWindow: element
-	
 ]
 
 { #category : #'examples - tiles provider' }
@@ -728,7 +725,7 @@ GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingLocal [
 	| element layer |
 	element := GeoViewElement new.
 
-	element maxScaleInMeters: element maxScale * 8.
+	element maxScale: element maxScale * 8.
 
 	"add carto layer"
 	layer := GeoViewMapTilesLayer newWithLocalDirectory name:
@@ -754,14 +751,29 @@ GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingOSM [
 	^ self openViewInWindow: element
 ]
 
+{ #category : #'examples - tiles provider' }
+GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingOSMWithMercatorProjection [
+	"This example show a map layer (assuming an internet connection to default url open street map"
+
+	| element layer |
+	element := GeoViewElement new.
+	element maxScale: element maxScale * 8.
+
+	"add carto layer"
+	layer := GeoViewMapTilesLayer new name: 'Tiles Layer'.
+	element addLayer: layer.
+
+	^ self openViewInWindow: element
+]
+
 { #category : #'examples - tiles provider' }
 GeoViewExamples class >> exampleGeoViewWithCartoTilesLayerUsingOSMWithSmallTileSize [
 	"This example show a map layer (assuming an internet connection to default url open street map"
 
 	| element layer |
 	element := GeoViewElement new.
 
-	element maxScaleInMeters: element maxScale * 8.
+	element maxScale: element maxScale * 8.
 
 	"add carto layer"
 	layer := GeoViewMapTilesLayer new name: 'Tiles Layer'.
@@ -1113,7 +1125,7 @@ GeoViewExamples class >> exampleTissotIndicatorMercator [
 
 	| element objects |
 	element := GeoViewUtils createGeoViewForGeoObjects.
-	element mapProjection: GeoViewMercatorProjection new. "by default"
+	element mapProjection: GeoViewMercatorProjection new.
 	"laborde: better to have a vectorial map to considere the deformation because tiles are not available for all projections"
 
 	"create sample datas"
@@ -1133,7 +1145,7 @@ GeoViewExamples class >> exampleTissotIndicatorUTM [
 	"warning before opening"
 	(UIManager default
 		 confirm:
-			 'This Tissot indicator example using a not finalized UTM Projection, it can works but without stability.
+			 'This Tissot indicator example using a work in progress UTM Projection, it can works but with glitchs and without stability.
 			Start ?'
 		 label: 'GeoView - Work in progress') ifFalse:[ ^ self ].
 
@@ -1149,6 +1161,23 @@ GeoViewExamples class >> exampleTissotIndicatorUTM [
 
 ]
 
+{ #category : #'examples - projections' }
+GeoViewExamples class >> exampleTissotIndicatorWebMercator [
+	"This example implement the indicator of Tissot (Nicolas August) for a projection, this indicator indicate the level of deformation of the selection projection"
+	
+	| element objects |
+	element := GeoViewUtils createGeoViewForGeoObjects.
+	"element mapProjection: GeoViewWebMercatorProjection new." "by default"
+	"laborde: better to have a vectorial map to considere the deformation because tiles are not available for all projections"
+	
+	"create sample datas"
+	objects := self createTissotIndicatorCircles.
+	element addObjects: objects.
+
+	^ self openViewInWindow: element
+	
+]
+
 { #category : #'examples - dshapeslayer' }
 GeoViewExamples class >> exampleVisibilityDShapesLayer [
 

src/GeoView-Tests/GeoViewAbstractElementTest.class.st

@@ -175,7 +175,7 @@ GeoViewAbstractElementTest >> testInitialize [
 	self assert: geoView extent equals: 1000 @ 1000.
 	self
 		assert: geoView mapProjection class
-		equals: GeoViewMercatorProjection.
+		equals: GeoViewWebMercatorProjection.
 	self
 		assert: geoView displayToGraphicProjection class
 		equals: GeoView2DProjection.