Merge pull request #98 from OpenSmock/dev-pla

Change tile loading thread priority.

Author: LabordePierre

src/GeoView/GeoViewLocalDirectoryTilesProvider.class.st

@@ -2,7 +2,8 @@ Class {
 	#name : #GeoViewLocalDirectoryTilesProvider,
 	#superclass : #GeoViewTilesProvider,
 	#instVars : [
-		'tileDirectory'
+		'tileDirectory',
+		'imageType'
 	],
 	#category : #'GeoView-Map'
 }
@@ -13,10 +14,16 @@ GeoViewLocalDirectoryTilesProvider class >> defaultDirectory [
 	^ FileLocator imageDirectory / 'map' / 'r'
 ]
 
-{ #category : #initialization }
-GeoViewLocalDirectoryTilesProvider >> initialize [ 
-	
-	super initialize.
+{ #category : #accessing }
+GeoViewLocalDirectoryTilesProvider >> imageType [
+
+	^ imageType
+]
+
+{ #category : #accessing }
+GeoViewLocalDirectoryTilesProvider >> imageType: anObject [
+
+	imageType := anObject
 ]
 
 { #category : #accessing }
@@ -35,13 +42,21 @@ GeoViewLocalDirectoryTilesProvider >> tileDirectory: anObject [
 { #category : #request }
 GeoViewLocalDirectoryTilesProvider >> tileFilenameFor: aZoomLevel x: anXCoordinate y: anYCoordinate [
 
-	| filename |
+	| filename types |
 	filename := self tileDirectory asFileReference.
 	filename exists ifFalse: [ ^ nil ].
 
 	filename := filename / aZoomLevel asString.
 	filename := filename / anXCoordinate asString.
-	filename := filename / (anYCoordinate asString , '.png').
+	filename := filename / anYCoordinate asString.
+
+	imageType ifNil:[
+		"trying to find the type of the image"	
+		types := #( 'jpg' 'png' ).
+		imageType := types detect:[ :e | (filename , (e asString)) exists ] ifNone:[ ^ nil ].
+	].
+	
+	filename := filename , imageType asString.
 
 	^ filename
 ]

src/GeoView/GeoViewMapTilesLayer.class.st

@@ -583,7 +583,8 @@ GeoViewMapTilesLayer >> loadAndRenderTiles: aListTilesXY on: aSurface offset: an
 				self dictTilesByLevel at: aLevel put: vMapServerTilesCopy.
 				vMapServerTilesCopy := vMapServerTilesCopy copy.
 
-				self updateMapBackground
+				self updateMapBackground.
+				Processor yield.
 
 			] on:[ Exception ] do:[:ex |
 					Transcript show: '[GeoView] Error on Tiles loading :'; show: ex printString; cr.
@@ -817,7 +818,7 @@ GeoViewMapTilesLayer >> restartMapBuilding [
 	self stopTilesWorker.
 
 	self loadingTilesWorker: ([ self doLoadingTilesThread ]
-			 forkAt: Processor userSchedulingPriority named: '[GeoView] Map Tiles loading')
+			 forkAt: Processor userBackgroundPriority named: '[GeoView] Map Tiles loading')
 ]
 
 { #category : #computing }
@@ -953,14 +954,14 @@ GeoViewMapTilesLayer >> updateModel: aContext [
 
 	currentGraphicProjection := self graphicProjection copy.
 
+	aContext isProjectionChanges ifFalse:[ ^ self ].
+	self graphicProjection ifNil: [ ^ self ].
+
 	(aContext isExtentChanged or:[ aContext isScaleChanged ]) ifTrue:[
 		self initSurfaceMap:
 			currentGraphicProjection extentInPixels + (self mapOffcenter negated).
 		self updateMapBackground.	
 	].
-	
-	aContext isProjectionChanges ifFalse:[ ^ self ].
-	self graphicProjection ifNil: [ ^ self ].
 
 	self previousCenter ifNil:[self previousCenter: currentGraphicProjection cartesianCenter copy]. 
 	aContext isCenterChanged ifTrue:[