Skip to content

Commit

Permalink
Merge pull request #4039 from camptocamp/check-spell
Browse files Browse the repository at this point in the history
Activate and fix spell
  • Loading branch information
sbrunner authored Jul 18, 2018
2 parents 5eb6a3d + 4eb55c2 commit cd3c064
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 26 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ script:
- make check-examples-checker
# Unit tests
- make test
- make spell
# Webpack build of ngeo/gmf examples and gmf apps
- if [ "${TRAVIS_PULL_REQUEST}" = false ]; then export NODE_ENV=production; fi
- make examples-hosted
Expand Down
9 changes: 0 additions & 9 deletions buildtools/check-no-goog.sh

This file was deleted.

2 changes: 1 addition & 1 deletion contribs/gmf/examples/authentication.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ exports.module.constant('angularLocaleScript', '../build/angular-locale_{{locale
exports.MainController = function(gettextCatalog) {
/**
* A password validator that check if the password as:
* - A minimal length of 8 characteres.
* - A minimal length of 8 characters.
* - At least one lowercase letter.
* - At least one Uppercase letter.
* - At least one digit.
Expand Down
2 changes: 1 addition & 1 deletion contribs/gmf/src/layertree/TreeManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ exports.prototype.refreshFirstLevelGroups_ = function(themes) {
}
});

// Readd the firstlevelgroups.
// Re add the firstlevelgroups.
this.setFirstLevelGroups(nodesToRestore);

// Wait that Angular has created the layetree, then update the permalink.
Expand Down
4 changes: 2 additions & 2 deletions contribs/gmf/src/less/popover.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.popover-content {
ul {
margin-bottom: 0;
/* fix issue with IE11 not sizing correcly the popover box */
/* fix issue with IE11 not sizing correctly the popover box */
min-width: 180px;
}

Expand Down Expand Up @@ -41,7 +41,7 @@
margin-left: @half-app-margin;
display: inline-block;
max-width: @popover-action-max-width - @half-app-margin;
/* fix issue with IE11 not sizing correcly the popover box */
/* fix issue with IE11 not sizing correctly the popover box */
padding: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ With Webpack, some things have changed between the current ngeo 2.3 version, and

## AngularJS names

Be as logical as possble. In the previous example, the AngularJS name should be `ngeoExampleSearch`. For
Be as logical as possible. In the previous example, the AngularJS name should be `ngeoExampleSearch`. For
a service in `contribs/gmf/src/sample/MyService.js`, the name must be `GmfSampleMyservice`.

Don't change a name after it's chosen. Because that change the html in the code of all user of ngeo !
Expand Down
4 changes: 2 additions & 2 deletions docs/how_to_migrate_from_2.2_to_2.3.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ It can help to see how `component`, `service`, `factory`, etc. are made in ngeo

Note for GeoMapFish:
Your application main controllers (files in `static-ngeo/js/<application>.js`). Are also concerned.
But as the build expects to find the interface name in the 'goog.provide', you must potentialy rename
But as the build expects to find the interface name in the 'goog.provide', you must potentially rename
your file to match the interface name.
Example: you have a `ngeodesktop` interface, that means that your file must be named `ngeodesktop.js` and the
file must provide `<an_app_name>_ngeodesktop`. You may have to exceptionnaly adapt this line in your
Expand Down Expand Up @@ -284,7 +284,7 @@ these values to the module of your controller like this:
moduleValue('myValueForThePrint': 'b');
// etc.
// You can assign all contant and value to your main module.
// You can assign all constant and value to your main module.
// The only exception is for the 'angularLocaleScript' because it must be loaded first.
// It must be provided like that:
var gmfAbstractAppControllerModule = angular.module('GmfAbstractAppControllerModule');
Expand Down
2 changes: 1 addition & 1 deletion src/Popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ exports.prototype.setMap = function(map) {

if (map) {
const contentEl = this.contentEl_;
// wait for the overlay to be rendered in the map before poping over
// wait for the overlay to be rendered in the map before popping over
window.setTimeout(() => {
$(element)
.popover({
Expand Down
18 changes: 9 additions & 9 deletions test/spec/data/wmtsCapabilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
const exports = '<?xml version="1.0" encoding="UTF-8"?>' +
'<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd">' +
'<ows:ServiceIdentification>' +
'<ows:Title>Koordinates Labs</ows:Title>' +
'<ows:Title>Coordinates Labs</ows:Title>' +
'<ows:ServiceType>OGC WMTS</ows:ServiceType>' +
'<ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>' +
'</ows:ServiceIdentification>' +
'<ows:ServiceProvider>' +
'<ows:ProviderName>Koordinates</ows:ProviderName>' +
'<ows:ProviderSite xlink:href="http://labs.koordinates.com" />' +
'<ows:ProviderName>Coordinates</ows:ProviderName>' +
'<ows:ProviderSite xlink:href="http://labs.coordinates.com" />' +
'<ows:ServiceContact />' +
'</ows:ServiceProvider>' +
'<ows:OperationsMetadata>' +
'<ows:Operation name="GetCapabilities">' +
'<ows:DCP>' +
'<ows:HTTP>' +
'<ows:Get xlink:href="https://labs.koordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/WMTSCapabilities.xml?">' +
'<ows:Get xlink:href="https://labs.coordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/WMTSCapabilities.xml?">' +
'<ows:Constraint name="GetEncoding">' +
'<ows:AllowedValues>' +
'<ows:Value>KVP</ows:Value>' +
Expand All @@ -30,7 +30,7 @@ const exports = '<?xml version="1.0" encoding="UTF-8"?>' +
'<ows:Operation name="GetFeatureInfo">' +
'<ows:DCP>' +
'<ows:HTTP>' +
'<ows:Get xlink:href="https://labs.koordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/?">' +
'<ows:Get xlink:href="https://labs.coordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/?">' +
'<ows:Constraint name="GetEncoding">' +
'<ows:AllowedValues>' +
'<ows:Value>KVP</ows:Value>' +
Expand Down Expand Up @@ -64,9 +64,9 @@ const exports = '<?xml version="1.0" encoding="UTF-8"?>' +
'<TileMatrixSetLink>' +
'<TileMatrixSet>EPSG:3857</TileMatrixSet>' +
'</TileMatrixSetLink>' +
'<ResourceURL format="image/png" resourceType="tile" template="https://koordinates-tiles-a.global.ssl.fastly.net/services;key=d740ea02e0c44cafb70dce31a774ca10/tiles/v4/layer=7328,{style}/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png" />' +
'<ResourceURL format="application/json" resourceType="FeatureInfo" template="https://labs.koordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/featureinfo/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}/{I}/{J}.json" />' +
'<ResourceURL format="text/html" resourceType="FeatureInfo" template="https://labs.koordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/featureinfo/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}/{I}/{J}.html" />' +
'<ResourceURL format="image/png" resourceType="tile" template="https://coordinates-tiles-a.global.ssl.fastly.net/services;key=d740ea02e0c44cafb70dce31a774ca10/tiles/v4/layer=7328,{style}/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png" />' +
'<ResourceURL format="application/json" resourceType="FeatureInfo" template="https://labs.coordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/featureinfo/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}/{I}/{J}.json" />' +
'<ResourceURL format="text/html" resourceType="FeatureInfo" template="https://labs.coordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/featureinfo/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}/{I}/{J}.html" />' +
'</Layer>' +
'<TileMatrixSet>' +
'<ows:Title>GoogleMapsCompatible</ows:Title>' +
Expand Down Expand Up @@ -278,7 +278,7 @@ const exports = '<?xml version="1.0" encoding="UTF-8"?>' +
'</TileMatrix>' +
'</TileMatrixSet>' +
'</Contents>' +
'<ServiceMetadataURL xlink:href="https://labs.koordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/WMTSCapabilities.xml" />' +
'<ServiceMetadataURL xlink:href="https://labs.coordinates.com/services;key=d740ea02e0c44cafb70dce31a774ca10/wmts/1.0.0/layer/7328/WMTSCapabilities.xml" />' +
'</Capabilities>';


Expand Down

0 comments on commit cd3c064

Please sign in to comment.