Merge pull request #107 from ThalesGroup/dev-104

Working on #104

Author: LabordePierre

README.md

@@ -1,8 +1,8 @@
 [![Pharo 12](https://img.shields.io/badge/Pharo-12-%23aac9ff.svg)](https://pharo.org/download)
 [![Pharo 13](https://img.shields.io/badge/Pharo-13-%23aac9ff.svg)](https://pharo.org/download)
 
-[![License](https://img.shields.io/github/license/OpenSmock/GeoView.svg)](./LICENSE)
-[![Unit tests](https://github.com/OpenSmock/GeoView/actions/workflows/CI.yml/badge.svg)](https://github.com/OpenSmock/GeoView/actions/workflows/CI.yml)
+[![License](https://img.shields.io/github/license/ThalesGroup/GeoView.svg)](./LICENSE)
+[![Unit tests](https://github.com/ThalesGroup/GeoView/actions/workflows/CI.yml/badge.svg)](https://github.com/ThalesGroup/GeoView/actions/workflows/CI.yml)
 
 # GeoView
 
@@ -85,7 +85,7 @@ To install **GeoView** with all features and dependencies, simply execute the fo
 ```smalltalk
 Metacello new
    baseline: 'GeoView';
-   repository: 'github://OpenSmock/GeoView:main/src';
+   repository: 'github://ThalesGroup/GeoView:main/src';
    load.
 ```
 
@@ -96,7 +96,7 @@ If you prefer to install only the core version of GeoView (without Molecule comp
 ```smalltalk
 Metacello new
    baseline: 'GeoView';
-   repository: 'github://OpenSmock/GeoView:main/src';
+   repository: 'github://ThalesGroup/GeoView:main/src';
    load: 'Core'.
 ```
 
@@ -107,7 +107,8 @@ Core :
 - [Alexandrie](https://github.com/pharo-graphics/alexandrie)
 - [Bloc](https://github.com/pharo-graphics/bloc)
 - [OpenSmock(Core)](https://github.com/OpenSmock/OpenSmock)
-- [GeoTools](https://github.com/OpenSmock/GeoTools)
+- [GeoTools](https://github.com/ThalesGroup/GeoTools)
+- [PharoOWS](https://github.com/ThalesGroup/PharoOWS)
 
 Default/Full adding :
 

src/BaselineOfGeoView/BaselineOfGeoView.class.st

@@ -24,8 +24,8 @@ BaselineOfGeoView >> baselineForCommon: spec [
 	self moleculePackages: spec.
 
 	"Groups"
-    spec group: 'default' with: (#('OpenSmock' 'GeoTools'), self corePackagesNames , self moleculePackagesNames).
-    spec group: 'Core' with: (#('OpenSmockCoreWithBloc' 'GeoTools'), self corePackagesNames).
+    spec group: 'default' with: (#('OpenSmock' 'GeoTools' 'OWS'), self corePackagesNames , self moleculePackagesNames).
+    spec group: 'Core' with: (#('OpenSmockCoreWithBloc' 'GeoTools' 'OWS'), self corePackagesNames).
 ]
 
 { #category : #dependencies }
@@ -34,7 +34,12 @@ BaselineOfGeoView >> commonDependencies: spec [
 	"GeoTools"
 	spec 
 		baseline: 'GeoTools' 
-		with: [	spec repository: 'github://OpenSmock/GeoTools:main' ].
+		with: [	spec repository: 'github://ThalesGroup/GeoTools:main' ].
+		
+	"OWS"
+	spec 
+		baseline: 'OWS' 
+		with: [	spec repository: 'github://ThalesGroup/PharoOWS:main' ].
 
 	"OpenSmock"
 	spec 

src/GeoView-Tests/GeoViewOpenStreetMapTilesProviderTest.class.st

@@ -0,0 +1,37 @@
+"
+A GeoViewOpenStreetMapTilesProviderTest is a test class for testing the behavior of GeoViewOpenStreetMapTilesProvider
+"
+Class {
+	#name : #GeoViewOpenStreetMapTilesProviderTest,
+	#superclass : #TestCase,
+	#instVars : [
+		'provider'
+	],
+	#category : #'GeoView-Tests-Map'
+}
+
+{ #category : #running }
+GeoViewOpenStreetMapTilesProviderTest >> setUp [
+
+	super setUp.
+
+	provider := GeoViewOpenStreetMapTilesProvider new
+]
+
+{ #category : #tests }
+GeoViewOpenStreetMapTilesProviderTest >> testHaveCopyrightNote [
+
+	self assert: provider haveCopyrightNote 
+]
+
+{ #category : #tests }
+GeoViewOpenStreetMapTilesProviderTest >> testInitialize [
+
+	self assert: provider notNil
+]
+
+{ #category : #tests }
+GeoViewOpenStreetMapTilesProviderTest >> testServerUrl [
+
+	self assert: provider serverUrl equals: (provider class primaryTileUrl)
+]

src/GeoView/GeoViewTilesProviderTMS.class.st

@@ -24,7 +24,7 @@ GeoViewTilesProviderTMS >> serverUrl: anObject [
 { #category : #accessing }
 GeoViewTilesProviderTMS >> service [
 
-	^ service ifNil: [ service := PharoOWSTMS new ]
+	^ service ifNil: [ service := OWSTMS new ]
 ]
 
 { #category : #request }