3127 merging annotations from c125_annotations branch #3137
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
* Annotations improvements for openlayers * removed point in card preview
…lved functionalities: QueryBuilder, FeatureEditor, Annotations (geosolutions-it#2624)
* Fix Reproject Geometries drawsupport OL * fixed also reprojetion when editing
* Closes geosolutions-it/austrocontrol-C125#45 * Fixed translation * Added test and fixed typo * Added action test * Fix on Mauro's comment
* Closes geosolutions-it/austrocontrol-C125#13
* Load annotations accept any valide geoJson file
* Added missing translations
* Closes geosolutions-it/austrocontrol-C125#26
* Fixes on Mauro's comment
* Fixed split search pattern
* Fix documentation issue (geosolutions-it#2606) * Fixes geosolutions-it#2608: custom mapOptions are not saved with maps (geosolutions-it#2609) * Fix geosolutions-it#2592 reorganized text widget into 1 page (geosolutions-it#2614) * Fixed sidegrid css for different screen resolutions (geosolutions-it#2616) Fix geosolutions-it#2593 * Fixes geosolutions-it#2542 Custom template for GetFeatureInfo (geosolutions-it#2591) * (Partial) Chinese language translation (geosolutions-it#2643) * add the Chinese langu * Fixed chinese language implementation * Added onlink handler to openlayers overlay layer (geosolutions-it#2644) * Fix geosolutions-it#2623. Implemented table widget (geosolutions-it#2635) - Externalized VirtualScroll functionalities to be reused - implemented wfsTable enhancer to support auto-data fetch/update with virtual scroll - Added to RequestBuilder sortBy and propertyName support - Add wfs to observable to reuse streams - Provided a getLayerJSONFeature (to extend) for a more rational usage of parameters ( old requests had to manage filterObj was containing sort and pagination options) - Set widgetContainer to be traggable only by header ( the cursor now changes where the widget is draggable) - Add sortable and defaultWidth options to FeatureGrid editor enhancer - Add support for columns resize, memorization and reset - tabular view of attribute selection * Closes geosolutions-it/austrocontrol-C125#26 (geosolutions-it#2632) * Closes geosolutions-it/austrocontrol-C125#26 * Fixes on Mauro's comment * Fixed split search pattern * Counter widget (geosolutions-it#2645) * Fixes geosolutions-it#2547: upgraded openlayers to 4.6.4 (geosolutions-it#2646) * Fixes geosolutions-it#2547: upgraded openlayers to 4.6.4 * Fix for tests * MousePosition degrees template via plugin props (geosolutions-it#2648) * MousePosition degrees template via plugin props * Removed unused import * Fix geosolutions-it#2615. Avoid widgets clear while saving (geosolutions-it#2649) * Fixes geosolutions-it#2665 Add an action to force resize of Map component (geosolutions-it#2666) * Austro#31# (geosolutions-it#2683) * Fixes geosolutions-it#2638 * Fixes geosolutions-it#2639 * Fixes geosolutions-it#2640 * Fixes geosolutions-it#2569: upgrade of leaflet version to 1.3.1 (and related dependencies) (geosolutions-it#2671) * Fixing leaflet randomly failing test (geosolutions-it#2697) * Closes geosolutions-it#2637 (geosolutions-it#2698) * Fixes geosolutions-it#2703: openalayers WMTS layers ignore initial visibility (geosolutions-it#2704) * 2626 updates measure tool (geosolutions-it#2701) * Fix geosolutions-it#2626 Updated measure tool * revert on test file * Made some changes, added arcs on leaflet * made length formula and showlabel configurable * fixed default config, added documentation * fixed reducer default
* Fix Circle draw/edit in annotation * fixed a typo and a boolean condition
# Conflicts: # package.json # web/client/components/TOC/fragments/settings/FeatureInfoEditor.jsx # web/client/components/map/leaflet/DrawSupport.jsx # web/client/components/misc/cardgrids/SideCard.jsx # web/client/components/misc/toolbar/Toolbar.jsx # web/client/components/widgets/widget/CounterWidget.jsx # web/client/components/widgets/widget/__tests__/CounterWidget-test.jsx # web/client/plugins/TOCItemsSettings.jsx # web/client/themes/default/icons.less # web/client/themes/default/icons/icons.eot # web/client/themes/default/icons/icons.svg # web/client/themes/default/icons/icons.ttf # web/client/themes/default/icons/icons.woff # web/client/themes/default/less/panels.less # web/client/translations/data.zh-ZH # web/client/utils/FileUtils.js # web/client/utils/__tests__/FileUtils-test.js
Merging master to c125_annotations
Fix circle bugs and added other improvements
…osolutions-it#2753) * Fix Translate iteractions on openlayers * Restored default values on close, fixed style of quill editor * fix tests * removed unused code in less annotations
* Fix issue on editing style in vector import * Fixed style of loaded vector layers * fixes on Matteo's comments * Fixed lint error
* Fix issue on editing style in vector import * Fixed style of loaded vector layers * fixes on Matteo's comments * Fixed lint error * Fixes geosolutions-it#16 * Fixed test * Fixed typo * Removed unused var
* fix geosolutions-it#49 maintain great circle in annotations * clean up code
* Fixed color style in pdf print * Tinycolor version # Conflicts: # web/client/utils/PrintUtils.js
…hen printing (geosolutions-it#2919) * Fixed color style in pdf print (geosolutions-it#2792) * Fixed color style in pdf print * Tinycolor version # Conflicts: # web/client/utils/PrintUtils.js * Fixes #29018: quick fix to printing styles of vector
* Fix geosolutions-it#2602 loader spinner on file import * Fixes geosolutions-it#2741: set openlayers single tile wms layers default ratio to 1 (geosolutions-it#2742) * Fixed geosolutions-it#2626 fixed leaflet measure tool (geosolutions-it#2730) * Fixed geosolutions-it#2626 fixed leaflet measure tool * added some comments to document changes * improved implementation * added more tests * Fix geosolutions-it#2746 leaflet drawing of linestring (geosolutions-it#2747) * fix leaflet override * fixed with retrocompatibility * Fixed binding of overridden functions * Croatian language translation (geosolutions-it#2755) * Fixes geosolutions-it#2748: leaflet draw issues (geosolutions-it#2752) * Fixes geosolutions-it#2748: leaflet draw issues * Additional fix for measures * Removed bootstrap overlay trigger (geosolutions-it#2734) * Fix geosolutions-it#2661 First implementation of map widget (geosolutions-it#2721) * Fixes geosolutions-it#2021: limit list of srs saved in layers from catalog to the ones supported by the current mapstore2 instance (geosolutions-it#2756) * Update README.md Add instructions to test MapStore2 using Docker containers * Fixes geosolutions-it#2760: integrated printing service (geosolutions-it#2761) * Added missing files for printing (geosolutions-it#2762) * Removed duplicated and mismatching in version libraries from geostore and mapfish-print (geosolutions-it#2763) * Fixes geosolutions-it#2631: usage of mapping libraries (geosolutions-it#2739) * Fixes geosolutions-it#2631: usage of mapping libraries * Fixed switching to 3d mode * Improved sidecard/sidegrid styles and structures (geosolutions-it#2764) * Quick fix to embedded map style (geosolutions-it#2766) * Fix geosolutions-it#2754 Add map widget layer's editing (geosolutions-it#2767) * Croatian language translation - update (geosolutions-it#2776) * Fix geosolutions-it#2778 Embedded doesn't work (geosolutions-it#2779) * Added embedded mode in standard app * Removed map layout reducers/epics * Fixed leaflet-draw inclusion in share api template (geosolutions-it#2782) * Connect to geosolutions-it#2662 Geodashboard single connection support (geosolutions-it#2780) * Improved widgets dependencies system * Support for single map connection * removed test for old map sync switches * Add support for map sync (geosolutions-it#2783) * Fix geosolutions-it#2775 Styles misalignment in BorderLayout component (geosolutions-it#2785) * Multiple map connection support (geosolutions-it#2791) * Fixes geosolutions-it#1506 OpenLayers and Leaflet vector different default styles (geosolutions-it#2771) * Fix geosolutions-it#2662. Add widget connections and colors (geosolutions-it#2793) * Improved suggestion when the user can not create a widget (geosolutions-it#2795) * Charts builder improvements (geosolutions-it#2796) * Fixed color style in pdf print (geosolutions-it#2792) * Fixed color style in pdf print * Tinycolor version * Fix geosolutions-it#2798 search clickable (geosolutions-it#2800) * fix geosolutions-it#2798 make clickable search in home * remove unneeded configuration * update spinner style dinamically and fix example icon * Add back buttons to dashboard and map widgets (geosolutions-it#2801) * Add empty state to featuregrid widget (geosolutions-it#2802) * Fix geosolutions-it#2787 Panels hide the feature info marker (geosolutions-it#2788) * Merge pull request #1 from geosolutions-it/master (geosolutions-it#2805) * translation data.zh-ZH * Modify spelling mistakes * Fixed geosolutions-it#2809. Moved utility function in the proper place (geosolutions-it#2810) * Fixed layout of counter widget (geosolutions-it#2804) * Add empty map to map selector (geosolutions-it#2813) * Fix geosolutions-it#2794 Force update of map widget position on save (geosolutions-it#2814) * Fix geosolutions-it#2807 and add a tool to create chart from feature grid (geosolutions-it#2808) * Fix geosolutions-it#2807 and add a tool to create chart from feature grid * add a flag for disabling chart creation from feature grid * fix feature grid toolbar test * update flag used to show char in feature grid * Exclude google background from widgets (geosolutions-it#2817) * Fix geosolutions-it#2812 parseInitialState function (geosolutions-it#2818) * fix geosolutions-it#2812 update parsing of initialState in localConfig.json * update parsing method * add documentation and test * update documentation * add default in toChangesMap and add a test for empty arrays * Fix geosolutions-it#2790 improved wizard messages (geosolutions-it#2819) * Fixes geosolutions-it#2815: elevation support in MousePosition, through elevation layers (geosolutions-it#2816) * fix geosolutions-it#2807 back interaction from widget to feature grid (geosolutions-it#2821) * Fix geosolutions-it#2803 add popover overlay to the sync tool in feature grid (geosolutions-it#2829) * Fix geosolutions-it#2696 map rotation style for openlayers (geosolutions-it#2820) * fix geosolutions-it#2696 aligned style of map rotation tool for ol * disable map rotation on openlayers * fix require of maplayout selector (geosolutions-it#2834) * Fix geosolutions-it#2798 change configuration and make search icon clickable and configurable (geosolutions-it#2831) * Fix geosolutions-it#2825. Improved messages in case of no attributes layer (geosolutions-it#2833) * Fixes geosolutions-it#2827 Add featured maps plugin (geosolutions-it#2828) * geosolutions-it#2827 Minor fixes (geosolutions-it#2836) * Fix geosolutions-it#2660 implemented first version of save functionalities for dashboard (geosolutions-it#2832) * Fix geosolutions-it#2773. First rules-editor implementation (geosolutions-it#2845) * Fixes geosolutions-it#2824: enable elevation layer only for cesium or when mouseposition is enabled (geosolutions-it#2841) * fix geosolutions-it#2803 synch popover defaults (geosolutions-it#2847) * fix geosolutions-it#2825 interactions between featuregrid anche chart wizard (geosolutions-it#2846) * Removed github link from navbar (geosolutions-it#2839) * fix geosolutions-it#2852 dev build fails (geosolutions-it#2853) * Fix geosolutions-it#2610 clipped long descriptions of catalog cards (geosolutions-it#2830) * Fix geosolutions-it#2664 Implemented browsing functionality for dashboards (geosolutions-it#2854) * First version of GeoDashboard browsing - Has a first abstraction of resources browser. can be reused in maps - Still to implement delete and effective link to dashboard * WIP for dashboard browsing Still missing: - i18n and tests - link to the contents - titles of tabs with parenthesis - tests - fix issues with geostore * Finalized code for dashboard browser - Missing translations and tests * Add sample category for dashboards * Fixed groups retrival by admin user * add some tests * Add unit tests * Add i18n * Fixed confirm dialog test * Improved empty view style * Fixed test's context not restored properly * add tests for geostore observables * Fix geosolutions-it#2825. Fixed error message for layers with no attributes (geosolutions-it#2855) * Fix geosolutions-it#2563: Fixed unnecessary details request on Map open (geosolutions-it#2849) * Update data.it-IT * Fixes geosolutions-it#2700 Toolbar icon for 3D map (geosolutions-it#2850) * Minor fixes to localized strings (geosolutions-it#2869) * Changed create map/dashboard buttons (geosolutions-it#2871) * Fix geosolutions-it#2843 and Fix geosolutions-it#2659. Fixed resize issues on dashboard and map widgets (geosolutions-it#2868) * Added GeoFence admin icon (geosolutions-it#2873) * Fix geosolutions-it#2856 Legend action plugin (geosolutions-it#2857) * Added details editor styles filters and attributes (geosolutions-it#2867) * Fix geosolutions-it#2876 Cross layer filter doesn't work if layer has localized title (geosolutions-it#2877) * Changed MapStore 2 strings to Mapstore (geosolutions-it#2882) - All translation files, html - Readme.md Doc pages, pom.xml and package.json still have MapStore 2 * Connected to geosolutions-it#2885. Temporary disabled video from detail sheet (geosolutions-it#2886) * Fix geosolutions-it#2842. Add legend widget (geosolutions-it#2884) * Fix geosolutions-it#2859 Escape special XML chars for title and description (geosolutions-it#2887) * fix geosolutions-it#2888 switch to correct 2d mode (geosolutions-it#2889) * Added area editor (geosolutions-it#2891) * Fix geosolutions-it#2892. Remove authkey from dashboard layers (geosolutions-it#2894) * Fixed home button position (geosolutions-it#2895) * Fix geosolutions-it#2862. Add geofence icon to the manager menu (geosolutions-it#2899) * Fix geosolutions-it#2663. Add edit and view mode to the dashboard (geosolutions-it#2901) * Fix geosolutions-it#2903. Add support to hide spatial and cross layer filter (geosolutions-it#2904) * fix geosolutions-it#2696 map rotation disables correctly (geosolutions-it#2905) * fix geosolutions-it#2861 layer metadata layout (geosolutions-it#2863) * fix geosolutions-it#2864 properties row viewer (geosolutions-it#2865) * Fix geosolutions-it#2898 TOC moves down if Measure tool and print are opened (geosolutions-it#2900) * fix geosolutions-it#2711 remove arc layer when toggling length measure tool (geosolutions-it#2902) * RuleEditor Layers filter always enabled (geosolutions-it#2907) * Showing spatial filter selection area when FeatureGrid is open (geosolutions-it#2906) * Moved icons for firefox/ie support (geosolutions-it#2912) * Modify SaveLayer in order to take the custom origin of a wms layer (geosolutions-it#2917) * Modify SaveLayer in order to take the custom origin of a wms layer in account (tilegrid config) * update maputils tests
# Conflicts: # web/client/actions/maps.js # web/client/components/catalog/RecordItem.jsx # web/client/components/data/featuregrid/toolbars/Toolbar.jsx # web/client/components/manager/rulesmanager/ruleseditor/EditMain.jsx # web/client/components/manager/rulesmanager/ruleseditor/Header.jsx # web/client/components/manager/rulesmanager/ruleseditor/__tests__/EditMain-test.jsx # web/client/components/manager/rulesmanager/ruleseditor/__tests__/Header-test.jsx # web/client/components/manager/rulesmanager/ruleseditor/attributeselectors/Layer.jsx # web/client/components/map/leaflet/DrawSupport.jsx # web/client/components/map/leaflet/Feature.jsx # web/client/components/map/openlayers/DrawSupport.jsx # web/client/components/map/openlayers/VectorStyle.js # web/client/components/map/openlayers/__tests__/DrawSupport-test.jsx # web/client/components/maps/MapCard.jsx # web/client/components/misc/cardgrids/SideCard.jsx # web/client/components/misc/cardgrids/__tests__/SideCard-test.jsx # web/client/components/widgets/builder/wizard/legend/Toolbar.jsx # web/client/components/widgets/builder/wizard/map/Toolbar.jsx # web/client/localConfig.json # web/client/plugins/CreateNewMap.jsx # web/client/plugins/Maps.jsx # web/client/plugins/featuregrid/panels/index.jsx # web/client/plugins/manager/EditorEnhancer.js # web/client/plugins/manager/RulesEditor.jsx # web/client/plugins/maps/MapsGrid.jsx # web/client/plugins/maps/MetadataModal.jsx # web/client/selectors/__tests__/highlight-test.js # web/client/selectors/highlight.js # web/client/themes/default/less/common.less # web/client/themes/default/less/rulesmanager.less # web/client/themes/default/less/widget.less # web/client/translations/data.de-DE # web/client/translations/data.en-US # web/client/translations/data.es-ES # web/client/translations/data.fr-FR # web/client/translations/data.hr-HR # web/client/translations/data.it-IT # web/client/translations/data.zh-ZH # web/client/utils/ColorUtils.js # web/client/utils/PrintUtils.js # web/client/utils/RulesEditor.js # web/client/utils/__tests__/CoordinatesUtils-test.js # web/client/utils/__tests__/MapUtils-test.js
* Fix bugs of coordinate editor for annotations * remove a comment * removed center point when the Circle is highlighted
geosolutions-it#80 Fix geosolutions-it#81 various issue on c125 project (geosolutions-it#3024)
…geosolutions-it#2995) This enables cookies to be sent to the receiving service.
Fixes also for missing translations # Conflicts: # web/client/components/TOC/DefaultLayer.jsx # web/client/components/TOC/__tests__/DefaultLayer-test.jsx # web/client/components/map/openlayers/DrawSupport.jsx # web/client/components/style/ColorPicker.jsx # web/client/epics/__tests__/identify-test.js # web/client/epics/identify.js
ghost
added
|
Thank you @MV88 to provide this. Please wait before proceeding with the integration. The merge of this PR must be properly planned. |
This was referenced Sep 11, 2018
|
More improvements are in progress into the c125_annotations branch. The work there will provide also an alignment with master branch. I'm going to close for the moment. |
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.
Description
This pr merges all the work done on the c12_annotations branch in master one
Issues
Please check if the PR fulfills these requirements
What kind of change does this PR introduce? (check one with "x", remove the others)
What is the current behavior? (You can also link to an open issue here)
Annotations are limited to marker annotation
What is the new behavior?
Now you can use new functionalities for annotations made on c125 project
Does this PR introduce a breaking change? (check one with "x", remove the other)
If this PR contains a breaking change, please describe the impact and migration path for existing applications: ...
Other information: