Update to master #6
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix schema suggestions to use gmx namespace for changed elements in new schema version * Add process to upgrade legacy metadata in catalog using old schema
…vement/schema/iso19110
… records. Old records will still be supported but will not validate against the new schema. The migration has to be triggered in order to update records.
Improvement/schema/iso19110
…gregation info element).
Pull request to synch with geonetwork/core-geonetwork repository
…s from this schema (to check)
Pull request to synch with geonetwork/core-geonetwork repository
#789 Feature catalogue schema in GeoNetwork is outdated
…orce the withheld elements to be withheld even if you are the owner or admin
Conflicts: web/src/main/java/org/fao/geonet/Geonetwork.java
- When in debug mode use the non-compressed version of the openlayers - Also added a missing CSW js scripts for debug mode.
…e reference to old user-profiles configuration.
…er (#1212) - define all NS to avoid XPath error if prefix defined with other value.
http://trac.osgeo.org/geonetwork/wiki/ExtendedRegions explains the change in detail. Essentially this change makes the list/search/get regions configurable so that the regions can be obtained from different sources like database, wfs, rdf file, etc... It changes the default regions to be the regions thesaurus file. Adds getMap and getGeom APIs. Maintains backwards compatibility in the API.
…tional helper when relevant.
Cleanup headers to avoid duplicate loading of the same headers. Duplicate loading of the protocol.js was causing ie7 to fail.
…h multiple locations
fixed bug with xml cache
some extra checks to make sure only editors can update metadata
josegar74
pushed a commit
that referenced
this pull request
Jan 26, 2015
Fixing regexp for layer type extraction from context
josegar74
pushed a commit
that referenced
this pull request
Jan 5, 2018
* If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, * propose the list in the import panel * allow user to change the style, once the layer added to the map * Once a layer is added, allows user to easily zoom to it using a notification link * Make distinction between a service URL with a layer name and only a service URL * Improve error display and add link to failed tiles so user can try and see tile load error message by clicking the link * When click add layer and only a service URL is set, switch to the mapviewer > add layer from service and set the service URL to make the GetCapabilities request and list available layers (instead of trying to add a layer with no name) * Result view button : display description or name or url * Always define the mandatory STYLES parameter. ESRI is more strict than others on that. Even STYLES without equal return an error which is probably wrong (this needs to be solved on ESRI side probably). For the time being set the STYLES parameter to empty if no STYLES choosen: ``` <ServiceException code="StylesNotDefined">Parameter 'styles' is required.</ServiceException> ``` Squashed commit of the following: commit 7415113 Author: Francois Prunayre <[email protected]> Date: Wed Dec 6 09:07:28 2017 +0100 Add missing mandatory STYLES. Improve error messages. commit 9fe45d5 Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 19:46:07 2017 +0100 Viewer improvements * Use gnViewerService when possible * Fix watch on getOpenedTool * Fix viewer service tab init to match the real GN app * Suggest user to zoom to the added layer * Related directive use the same addToMap function than search results commit 73f2192 Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 19:42:39 2017 +0100 Related directive / Make distinction between a service link and a service+layer link. commit 598dc5d Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 19:41:43 2017 +0100 Add possibility to increase notification delay. commit 73509ee Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:45:25 2017 +0100 Click on layer title show/hide layer. commit 17d2dec Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:30:50 2017 +0100 Show style selector only for children. commit d5fff3b Merge: aa1f53d 3f59778 Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:10:48 2017 +0100 Merge remote-tracking branch 'fxprunayre/improvement/map-layer-styles-and-errors' into improvement/map-layer-styles-and-errors commit aa1f53d Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:03:41 2017 +0100 Remove layer popup in case layer is removed. commit b639d11 Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 13:12:31 2017 +0100 Display legend or attribution when available. Update legend URL on style change. commit 609e34d Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 09:13:41 2017 +0100 Map / Add layer / Style may be null. commit 4a8e9b7 Author: Francois Prunayre <[email protected]> Date: Sun Nov 12 09:24:53 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 - Improvements. commit 836032f Author: Francois Prunayre <[email protected]> Date: Fri Nov 10 09:29:31 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 * If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, propose the list in the import panel * allow user to change the style, once the layer added to the map commit 3f59778 Merge: aad4756 a329386 Author: François Prunayre <[email protected]> Date: Tue Nov 21 14:31:39 2017 +0100 Merge pull request #6 from MichelGabriel/3.4.x-improve-mappanels Improve map panels commit a329386 Merge: bd3736b aad4756 Author: Michel Gabriël <[email protected]> Date: Thu Nov 16 15:49:21 2017 +0100 Merge branch 'improvement/map-layer-styles-and-errors' into 3.4.x-improve-mappanels commit bd3736b Author: Michel Gabriel <[email protected]> Date: Thu Nov 16 11:27:52 2017 +0100 Changes to the manage layer drop down: * added whitespace * added borders * added 2 titles commit 028d6ad Author: Michel Gabriel <[email protected]> Date: Thu Nov 16 10:18:32 2017 +0100 Better outlining the text in the styles popover commit 46999f0 Author: Michel Gabriel <[email protected]> Date: Thu Nov 16 10:18:00 2017 +0100 Add the `add to map` button * add button as last element in an list item * no `add to map` title on the layer commit aad4756 Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 13:12:31 2017 +0100 Display legend or attribution when available. Update legend URL on style change. commit 7ae29fa Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 09:13:41 2017 +0100 Map / Add layer / Style may be null. commit 9a0f0da Author: Francois Prunayre <[email protected]> Date: Sun Nov 12 09:24:53 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 - Improvements. commit 945771f Author: Francois Prunayre <[email protected]> Date: Fri Nov 10 09:29:31 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 * If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, propose the list in the import panel * allow user to change the style, once the layer added to the map commit da29201 Author: Michel Gabriel <[email protected]> Date: Wed Nov 15 13:43:12 2017 +0100 Improvements to the `add layer panel` * new `add to map` button * max height for lists of layers * reset button to clear list and url * less whitespace in `services` tab commit 2c24ea3 Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 13:12:31 2017 +0100 Display legend or attribution when available. Update legend URL on style change. commit 3532aee Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 09:13:41 2017 +0100 Map / Add layer / Style may be null. commit 6bde95d Author: Francois Prunayre <[email protected]> Date: Sun Nov 12 09:24:53 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 - Improvements. commit 4b65e5c Author: Francois Prunayre <[email protected]> Date: Fri Nov 10 09:29:31 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 * If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, propose the list in the import panel * allow user to change the style, once the layer added to the map Avoid error if no metadata. If layer not in capability suggest user to load another one.
josegar74
pushed a commit
that referenced
this pull request
Jan 5, 2018
* If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, * propose the list in the import panel * allow user to change the style, once the layer added to the map * Once a layer is added, allows user to easily zoom to it using a notification link * Make distinction between a service URL with a layer name and only a service URL * Improve error display and add link to failed tiles so user can try and see tile load error message by clicking the link * When click add layer and only a service URL is set, switch to the mapviewer > add layer from service and set the service URL to make the GetCapabilities request and list available layers (instead of trying to add a layer with no name) * Result view button : display description or name or url * Always define the mandatory STYLES parameter. ESRI is more strict than others on that. Even STYLES without equal return an error which is probably wrong (this needs to be solved on ESRI side probably). For the time being set the STYLES parameter to empty if no STYLES choosen: ``` <ServiceException code="StylesNotDefined">Parameter 'styles' is required.</ServiceException> ``` Squashed commit of the following: commit 7415113 Author: Francois Prunayre <[email protected]> Date: Wed Dec 6 09:07:28 2017 +0100 Add missing mandatory STYLES. Improve error messages. commit 9fe45d5 Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 19:46:07 2017 +0100 Viewer improvements * Use gnViewerService when possible * Fix watch on getOpenedTool * Fix viewer service tab init to match the real GN app * Suggest user to zoom to the added layer * Related directive use the same addToMap function than search results commit 73f2192 Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 19:42:39 2017 +0100 Related directive / Make distinction between a service link and a service+layer link. commit 598dc5d Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 19:41:43 2017 +0100 Add possibility to increase notification delay. commit 73509ee Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:45:25 2017 +0100 Click on layer title show/hide layer. commit 17d2dec Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:30:50 2017 +0100 Show style selector only for children. commit d5fff3b Merge: aa1f53d 3f59778 Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:10:48 2017 +0100 Merge remote-tracking branch 'fxprunayre/improvement/map-layer-styles-and-errors' into improvement/map-layer-styles-and-errors commit aa1f53d Author: Francois Prunayre <[email protected]> Date: Tue Dec 5 17:03:41 2017 +0100 Remove layer popup in case layer is removed. commit b639d11 Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 13:12:31 2017 +0100 Display legend or attribution when available. Update legend URL on style change. commit 609e34d Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 09:13:41 2017 +0100 Map / Add layer / Style may be null. commit 4a8e9b7 Author: Francois Prunayre <[email protected]> Date: Sun Nov 12 09:24:53 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 - Improvements. commit 836032f Author: Francois Prunayre <[email protected]> Date: Fri Nov 10 09:29:31 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 * If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, propose the list in the import panel * allow user to change the style, once the layer added to the map commit 3f59778 Merge: aad4756 a329386 Author: François Prunayre <[email protected]> Date: Tue Nov 21 14:31:39 2017 +0100 Merge pull request #6 from MichelGabriel/3.4.x-improve-mappanels Improve map panels commit a329386 Merge: bd3736b aad4756 Author: Michel Gabriël <[email protected]> Date: Thu Nov 16 15:49:21 2017 +0100 Merge branch 'improvement/map-layer-styles-and-errors' into 3.4.x-improve-mappanels commit bd3736b Author: Michel Gabriel <[email protected]> Date: Thu Nov 16 11:27:52 2017 +0100 Changes to the manage layer drop down: * added whitespace * added borders * added 2 titles commit 028d6ad Author: Michel Gabriel <[email protected]> Date: Thu Nov 16 10:18:32 2017 +0100 Better outlining the text in the styles popover commit 46999f0 Author: Michel Gabriel <[email protected]> Date: Thu Nov 16 10:18:00 2017 +0100 Add the `add to map` button * add button as last element in an list item * no `add to map` title on the layer commit aad4756 Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 13:12:31 2017 +0100 Display legend or attribution when available. Update legend URL on style change. commit 7ae29fa Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 09:13:41 2017 +0100 Map / Add layer / Style may be null. commit 9a0f0da Author: Francois Prunayre <[email protected]> Date: Sun Nov 12 09:24:53 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 - Improvements. commit 945771f Author: Francois Prunayre <[email protected]> Date: Fri Nov 10 09:29:31 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 * If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, propose the list in the import panel * allow user to change the style, once the layer added to the map commit da29201 Author: Michel Gabriel <[email protected]> Date: Wed Nov 15 13:43:12 2017 +0100 Improvements to the `add layer panel` * new `add to map` button * max height for lists of layers * reset button to clear list and url * less whitespace in `services` tab commit 2c24ea3 Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 13:12:31 2017 +0100 Display legend or attribution when available. Update legend URL on style change. commit 3532aee Author: Francois Prunayre <[email protected]> Date: Mon Nov 13 09:13:41 2017 +0100 Map / Add layer / Style may be null. commit 6bde95d Author: Francois Prunayre <[email protected]> Date: Sun Nov 12 09:24:53 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 - Improvements. commit 4b65e5c Author: Francois Prunayre <[email protected]> Date: Fri Nov 10 09:29:31 2017 +0100 Map viewer / Improve the add layer to map process geonetwork#2289 * If a layer is already in the map, warn user that it is the case and switch to the map viewer (currently, silently stop) * If the service URL is wrong or does not respond, inform user * If a layer is available with more than one representation type, propose the list in the import panel * allow user to change the style, once the layer added to the map Avoid error if no metadata. If layer not in capability suggest user to load another one.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.