diff --git a/ressources/map.png b/ressources/map.png index 4639618..b7fc3d7 100644 Binary files a/ressources/map.png and b/ressources/map.png differ diff --git a/src/BaselineOfMoleculeGeographicalPositionExample/BaselineOfMoleculeGeographicalPositionExample.class.st b/src/BaselineOfMoleculeGeographicalPositionExample/BaselineOfMoleculeGeographicalPositionExample.class.st index fd35201..62241bd 100644 --- a/src/BaselineOfMoleculeGeographicalPositionExample/BaselineOfMoleculeGeographicalPositionExample.class.st +++ b/src/BaselineOfMoleculeGeographicalPositionExample/BaselineOfMoleculeGeographicalPositionExample.class.st @@ -46,10 +46,12 @@ BaselineOfMoleculeGeographicalPositionExample >> loadPyramid: spec [ { #category : #'load scripts' } BaselineOfMoleculeGeographicalPositionExample >> postload: loader package: packageSpec [ - | molGeoPosHelper | - "Open helper." - molGeoPosHelper := #MolGeoPosHelper asClassInEnvironment: self class environment. - molGeoPosHelper openAsUnclosableWindow. + | molGeoDownloadedRessource | + + molGeoDownloadedRessource := #MolGeoDownloadedRessource asClassInEnvironment: self class environment. + + molGeoDownloadedRessource ensureAllDownloaded + ] { #category : #'load scripts' } diff --git a/src/Molecule-Geographical-Position-Example/MolGeoButtonElementAbstract.class.st b/src/Molecule-Geographical-Position-Example/MolGeoButtonElementAbstract.class.st index 1761194..84e420d 100644 --- a/src/Molecule-Geographical-Position-Example/MolGeoButtonElementAbstract.class.st +++ b/src/Molecule-Geographical-Position-Example/MolGeoButtonElementAbstract.class.st @@ -257,7 +257,7 @@ MolGeoButtonElementAbstract >> defaultFontSize [ ^ 16 ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementAbstract >> hoverColor [ ^ self shouldBeImplemented @@ -322,13 +322,13 @@ MolGeoButtonElementAbstract >> makeNewLabelElement: aString [ ^ rope asElement ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementAbstract >> primaryColor [ ^ self shouldBeImplemented ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementAbstract >> secondaryColor [ ^ self shouldBeImplemented diff --git a/src/Molecule-Geographical-Position-Example/MolGeoButtonElementNotSelected.class.st b/src/Molecule-Geographical-Position-Example/MolGeoButtonElementNotSelected.class.st index e187c6a..a3fcc4e 100644 --- a/src/Molecule-Geographical-Position-Example/MolGeoButtonElementNotSelected.class.st +++ b/src/Molecule-Geographical-Position-Example/MolGeoButtonElementNotSelected.class.st @@ -13,19 +13,19 @@ MolGeoButtonElementNotSelected class >> example [ openInNewSpace ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementNotSelected >> hoverColor [ ^ Color fromHexString: '#bebdbf' ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementNotSelected >> primaryColor [ ^ Color fromHexString: '#6c757d' ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementNotSelected >> secondaryColor [ ^ Color transparent diff --git a/src/Molecule-Geographical-Position-Example/MolGeoButtonElementSelected.class.st b/src/Molecule-Geographical-Position-Example/MolGeoButtonElementSelected.class.st index 9acdf76..3c61708 100644 --- a/src/Molecule-Geographical-Position-Example/MolGeoButtonElementSelected.class.st +++ b/src/Molecule-Geographical-Position-Example/MolGeoButtonElementSelected.class.st @@ -13,13 +13,13 @@ MolGeoButtonElementSelected class >> example [ openInNewSpace ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementSelected >> hoverColor [ ^ Color fromHexString: '#78A7D6' ] -{ #category : #accessing } +{ #category : #'accessing - text' } MolGeoButtonElementSelected >> makeNewLabelElement: aString [ | rope | @@ -31,13 +31,13 @@ MolGeoButtonElementSelected >> makeNewLabelElement: aString [ ^ rope asElement ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementSelected >> primaryColor [ ^ Color fromHexString: '#0D3151' ] -{ #category : #'as yet unclassified' } +{ #category : #'accessing - colors' } MolGeoButtonElementSelected >> secondaryColor [ ^ Color fromHexString: '#8DBEF1' diff --git a/src/Molecule-Geographical-Position-Example/MolGeoPosApplication.class.st b/src/Molecule-Geographical-Position-Example/MolGeoPosApplication.class.st index 4b90f5f..a639fd9 100644 --- a/src/Molecule-Geographical-Position-Example/MolGeoPosApplication.class.st +++ b/src/Molecule-Geographical-Position-Example/MolGeoPosApplication.class.st @@ -30,6 +30,16 @@ MolGeoPosApplication class >> open [ ^ self new openApplication ] +{ #category : #accessing } +MolGeoPosApplication >> getMapComponent [ + + | manager | + manager := MolComponentManager default. + + ^ manager locatorServices searchComponentTypeImplementorFor: + MolGeoPosReceiverType +] + { #category : #private } MolGeoPosApplication >> iconSize [ @@ -126,6 +136,16 @@ MolGeoPosApplication >> makeGalileoButton [ yourself ] +{ #category : #factory } +MolGeoPosApplication >> makeMapComponent [ + + | mapElement | + mapElement := MolUtils instanceOf: MolGeoPositionMapReicever. + mapElement backgroundForm: self mapForm. + mapElement margin: (BlInsets bottom: 16). + ^ mapElement +] + { #category : #private } MolGeoPosApplication >> makeWiFiButton [ @@ -174,6 +194,18 @@ MolGeoPosApplication >> openApplication [ space show ] +{ #category : #control } +MolGeoPosApplication >> pauseMapComponent [ + + self getMapComponent componentPassivate +] + +{ #category : #control } +MolGeoPosApplication >> stopAllComponents [ + +MolComponentManager cleanUp +] + { #category : #private } MolGeoPosApplication >> stopGeoPosEquipement [ "stops every possible component if it's launched" @@ -192,6 +224,12 @@ MolGeoPosApplication >> stopGeoPosEquipement [ component class stop ] +{ #category : #control } +MolGeoPosApplication >> unpauseMapComponent [ + + self getMapComponent componentActivate +] + { #category : #private } MolGeoPosApplication >> windowSize [