Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

C125 Features Porting #3607

Merged
merged 133 commits into from
May 30, 2019
Merged

C125 Features Porting #3607

merged 133 commits into from
May 30, 2019

Conversation

offtherailz
Copy link
Member

@offtherailz offtherailz commented Mar 8, 2019

Description

This PR ports all the fixes developed on branch c125_annotations to master branch

  • TODO List the features added

Issues

Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (check one with "x", remove the others)

  • Feature

URL of RTD document: https://mapstore.readthedocs.io/en/c125_annotations/ Documentation Status

URL of RTD document: https://mapstore.readthedocs.io/en/c125_annotations/ Documentation Status

MV88 and others added 30 commits February 16, 2018 10:39
* Annotations improvements for openlayers

* removed point in card preview
…lved functionalities: QueryBuilder, FeatureEditor, Annotations (#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 (#2606)

* Fixes #2608: custom mapOptions are not saved with maps (#2609)

* Fix #2592 reorganized text widget into 1 page (#2614)

* Fixed sidegrid css  for different screen resolutions (#2616)

Fix #2593

* Fixes #2542 Custom template for GetFeatureInfo  (#2591)

* (Partial) Chinese language translation (#2643)

* add the Chinese langu

* Fixed chinese language implementation

* Added onlink handler to openlayers overlay layer (#2644)

* Fix #2623. Implemented table widget (#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 (#2632)

* Closes geosolutions-it/austrocontrol-C125#26

* Fixes on Mauro's comment

* Fixed split search pattern

* Counter widget (#2645)

* Fixes #2547: upgraded openlayers to 4.6.4 (#2646)

* Fixes #2547: upgraded openlayers to 4.6.4

* Fix for tests

* MousePosition degrees template via plugin props (#2648)

* MousePosition degrees template via plugin props

* Removed unused import

*  Fix #2615. Avoid widgets clear while saving (#2649)

* Fixes #2665 Add an action to force resize of Map component (#2666)

* Austro#31# (#2683)

* Fixes #2638

* Fixes #2639

* Fixes #2640

* Fixes #2569: upgrade of leaflet version to 1.3.1 (and related dependencies) (#2671)

* Fixing leaflet randomly failing test (#2697)

* Closes #2637 (#2698)

* Fixes #2703: openalayers WMTS layers ignore initial visibility (#2704)

* 2626 updates measure tool (#2701)

* Fix #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
)

* 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 #16

* Fixed test

* Fixed typo

* Removed unused var
* fix #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 (#2919)

* Fixed color style in pdf print (#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 #2602 loader spinner on file import

* Fixes #2741: set openlayers single tile wms layers default ratio to 1 (#2742)

* Fixed #2626 fixed leaflet measure tool (#2730)

* Fixed #2626 fixed leaflet measure tool

* added some comments to document changes

* improved implementation

* added more tests

* Fix #2746 leaflet drawing of linestring (#2747)

* fix leaflet override

* fixed with retrocompatibility

* Fixed binding of overridden functions

* Croatian language translation (#2755)

* Fixes #2748: leaflet draw issues (#2752)

* Fixes #2748: leaflet draw issues

* Additional fix for measures

* Removed bootstrap overlay trigger (#2734)

* Fix #2661 First implementation of map widget (#2721)

* Fixes #2021: limit list of srs saved in layers from catalog to the ones supported by the current mapstore2 instance (#2756)

* Update README.md

Add instructions to test MapStore2 using Docker containers

* Fixes #2760: integrated printing service (#2761)

* Added missing files for printing (#2762)

* Removed duplicated and mismatching in version libraries from geostore and mapfish-print (#2763)

* Fixes #2631: usage of mapping libraries (#2739)

* Fixes #2631: usage of mapping libraries

* Fixed switching to 3d mode

* Improved sidecard/sidegrid styles and structures (#2764)

* Quick fix to embedded map style (#2766)

* Fix #2754 Add map widget layer's editing (#2767)

* Croatian language translation - update (#2776)

* Fix #2778 Embedded doesn't work  (#2779)

* Added embedded mode in standard app

* Removed map layout reducers/epics

* Fixed leaflet-draw inclusion in share api template (#2782)

* Connect to #2662 Geodashboard single connection support (#2780)

* Improved widgets dependencies system

* Support for single map connection

* removed test for old map sync switches

* Add support for map sync (#2783)

* Fix #2775 Styles misalignment in BorderLayout component (#2785)

* Multiple map connection support (#2791)

* Fixes #1506 OpenLayers and Leaflet vector different default styles  (#2771)

* Fix #2662. Add widget connections and colors (#2793)

* Improved suggestion when the user can not create a widget (#2795)

* Charts builder improvements (#2796)

* Fixed color style in pdf print (#2792)

* Fixed color style in pdf print

* Tinycolor version

* Fix #2798 search clickable (#2800)

* fix #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 (#2801)

* Add empty state to featuregrid widget (#2802)

* Fix #2787 Panels hide the feature info marker (#2788)

* Merge pull request #1 from geosolutions-it/master (#2805)

* translation data.zh-ZH

* Modify spelling mistakes

* Fixed #2809. Moved utility function in the proper place (#2810)

* Fixed layout of counter widget (#2804)

* Add empty map to map selector (#2813)

* Fix #2794 Force update of map widget position on save (#2814)

* Fix #2807 and add a tool to create chart from feature grid (#2808)

* Fix #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 (#2817)

* Fix #2812 parseInitialState function  (#2818)

* fix #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 #2790 improved wizard messages (#2819)

* Fixes #2815: elevation support in MousePosition, through elevation layers (#2816)

* fix #2807 back interaction from widget to feature grid (#2821)

* Fix #2803 add popover overlay to the sync tool in feature grid (#2829)

* Fix #2696 map rotation style for openlayers (#2820)

* fix #2696 aligned style of map rotation tool for ol

* disable map rotation on openlayers

* fix require of maplayout selector (#2834)

* Fix #2798 change configuration and make search icon clickable and configurable (#2831)

* Fix #2825. Improved messages in case of no attributes layer (#2833)

* Fixes #2827 Add featured maps plugin (#2828)

* #2827 Minor fixes (#2836)

* Fix #2660 implemented first version of save functionalities for dashboard (#2832)

* Fix #2773. First rules-editor implementation (#2845)

* Fixes #2824: enable elevation layer only for cesium or when mouseposition is enabled (#2841)

* fix #2803 synch popover defaults (#2847)

* fix #2825 interactions between featuregrid anche chart wizard (#2846)

* Removed github link from navbar (#2839)

* fix #2852 dev build fails (#2853)

* Fix #2610 clipped long descriptions of catalog cards (#2830)

* Fix #2664 Implemented browsing functionality for dashboards (#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 #2825. Fixed error message for layers with no attributes (#2855)

* Fix #2563: Fixed unnecessary details request on Map open (#2849)

* Update data.it-IT

* Fixes #2700  Toolbar icon for 3D map (#2850)

* Minor fixes to localized strings (#2869)

* Changed create map/dashboard buttons (#2871)

* Fix #2843 and Fix #2659. Fixed resize issues on dashboard and map widgets (#2868)

* Added GeoFence admin icon (#2873)

* Fix #2856 Legend action plugin (#2857)

* Added details editor styles filters and  attributes (#2867)

* Fix #2876 Cross layer filter doesn't work if layer has localized title (#2877)

* Changed MapStore 2 strings  to Mapstore (#2882)

- All translation files, html
 - Readme.md Doc pages, pom.xml and package.json still have MapStore 2

* Connected to #2885. Temporary disabled video from detail sheet (#2886)

* Fix #2842. Add legend widget (#2884)

* Fix #2859 Escape special XML chars for title and description (#2887)

* fix #2888 switch to correct 2d mode (#2889)

* Added area editor (#2891)

* Fix #2892. Remove authkey from dashboard layers (#2894)

* Fixed home button position (#2895)

* Fix #2862. Add geofence icon to the manager menu (#2899)

* Fix #2663. Add edit and view mode to the dashboard (#2901)

* Fix #2903. Add support to hide spatial and cross layer filter (#2904)

* fix #2696 map rotation disables correctly (#2905)

* fix #2861 layer metadata layout (#2863)

* fix #2864 properties row viewer (#2865)

* Fix #2898 TOC moves down if Measure tool and print are opened (#2900)

* fix #2711 remove arc layer when toggling length measure tool (#2902)

* RuleEditor Layers filter always enabled (#2907)

* Showing spatial filter selection area when FeatureGrid is open (#2906)

* Moved icons for firefox/ie support (#2912)

* Modify SaveLayer in order to take the custom origin of a wms layer (#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
@rtd-helper
Copy link

rtd-helper bot commented Apr 4, 2019

Failed to launch chrome!
[0404/153307.893217:ERROR:platform_thread_posix.cc(129)] pthread_create: Resource temporarily unavailable (11)
[0404/153307.893279:FATAL:browser_process_sub_thread.cc(93)] Failed to start BrowserThread:IO
#0 0x560c29e43d49 base::debug::CollectStackTrace()
#1 0x560c29dab023 base::debug::StackTrace::StackTrace()
#2 0x560c29dbf0be logging::LogMessage::~LogMessage()
#3 0x560c284efdf8 content::BrowserProcessSubThread::CreateIOThread()
#4 0x560c29a03dea content::ContentMainRunnerImpl::RunServiceManager()
#5 0x560c29a03c56 content::ContentMainRunnerImpl::Run()
#6 0x560c29a36b21 service_manager::Main()
#7 0x560c29a01f61 content::ContentMain()
#8 0x560c2e01b9e8 headless::(anonymous namespace)::RunContentMain()
#9 0x560c2e01ba75 headless::HeadlessBrowserMain()
#10 0x560c29a35473 headless::HeadlessShellMain()
#11 0x560c279571ac ChromeMain
#12 0x7fd840e9ab97 __libc_start_main
#13 0x560c2795702a _start

Received signal 6
#0 0x560c29e43d49 base::debug::CollectStackTrace()
#1 0x560c29dab023 base::debug::StackTrace::StackTrace()
#2 0x560c29e438d1 base::debug::(anonymous namespace)::StackDumpSignalHandler()
#3 0x7fd847111890
#4 0x7fd840eb7e97 gsignal
#5 0x7fd840eb9801 abort
#6 0x560c29e42705 base::debug::BreakDebugger()
#7 0x560c29dbf301 logging::LogMessage::~LogMessage()
#8 0x560c284efdf8 content::BrowserProcessSubThread::CreateIOThread()
#9 0x560c29a03dea content::ContentMainRunnerImpl::RunServiceManager()
#10 0x560c29a03c56 content::ContentMainRunnerImpl::Run()
#11 0x560c29a36b21 service_manager::Main()
#12 0x560c29a01f61 content::ContentMain()
#13 0x560c2e01b9e8 headless::(anonymous namespace)::RunContentMain()
#14 0x560c2e01ba75 headless::HeadlessBrowserMain()
#15 0x560c29a35473 headless::HeadlessShellMain()
#16 0x560c279571ac ChromeMain
#17 0x7fd840e9ab97 __libc_start_main
#18 0x560c2795702a _start
r8: 0000000000000000 r9: 00007ffefef922b0 r10: 0000000000000008 r11: 0000000000000246
r12: 00007ffefef92558 r13: 000000000000005d r14: 00007ffefef92ec0 r15: 00007ffefef92eb8
di: 0000000000000002 si: 00007ffefef922b0 bp: 00007ffefef92500 bx: 000024dd965a5a80
dx: 0000000000000000 ax: 0000000000000000 cx: 00007fd840eb7e97 sp: 00007ffefef922b0
ip: 00007fd840eb7e97 efl: 0000000000000246 cgf: 0010000000000033 erf: 0000000000000000
trp: 0000000000000000 msk: 0000000000000000 cr2: 0000000000000000
[end of stack trace]
Calling _exit(1). Core file will not be generated.

TROUBLESHOOTING: https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md

@geosolutions-it geosolutions-it deleted a comment Apr 4, 2019
@geosolutions-it geosolutions-it deleted a comment Apr 5, 2019
@geosolutions-it geosolutions-it deleted a comment Apr 5, 2019
@geosolutions-it geosolutions-it deleted a comment Apr 12, 2019
@MV88 MV88 added this to the 2019.02.00 milestone Apr 29, 2019
@MV88 MV88 marked this pull request as ready for review May 9, 2019 14:24
MV88 and others added 3 commits May 9, 2019 17:02
# Conflicts:
#	package.json
#	web/client/actions/layers.js
#	web/client/actions/mapInfo.js
#	web/client/components/TOC/DefaultLayer.jsx
#	web/client/components/TOC/__tests__/DefaultLayer-test.jsx
#	web/client/components/map/openlayers/DrawSupport.jsx
#	web/client/components/map/openlayers/Feature.jsx
#	web/client/components/map/openlayers/__tests__/VectorStyle-test.js
#	web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx
#	web/client/components/misc/enhancers/draggableComponent.jsx
#	web/client/components/misc/toolbar/Toolbar.jsx
#	web/client/components/style/ColorPicker.jsx
#	web/client/epics/__tests__/annotations-test.js
#	web/client/epics/__tests__/identify-test.js
#	web/client/epics/__tests__/layers-test.js
#	web/client/epics/annotations.js
#	web/client/epics/identify.js
#	web/client/epics/layers.js
#	web/client/epics/maplayout.js
#	web/client/libs/__tests__/ajax-test.js
#	web/client/plugins/Annotations.jsx
#	web/client/plugins/Identify.jsx
#	web/client/plugins/TOC.jsx
#	web/client/reducers/__tests__/layers-test.js
#	web/client/reducers/__tests__/mapInfo-test.js
#	web/client/selectors/__tests__/annotations-test.js
#	web/client/selectors/__tests__/layers-test.js
#	web/client/selectors/annotations.js
#	web/client/selectors/layers.js
#	web/client/selectors/mapinfo.js
#	web/client/stores/StandardStore.js
#	web/client/themes/default/bootstrap-theme.less
#	web/client/themes/default/less/panels.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.zh-ZH
#	web/client/utils/__tests__/MapUtils-test.js
Align master 09 05 19 over c125_annotations
@ghost ghost assigned tdipisa May 14, 2019
@coveralls
Copy link

coveralls commented May 14, 2019

Coverage Status

Coverage decreased (-0.05%) to 81.401% when pulling 665403c on c125_annotations into 50c18da on master.

MV88 and others added 8 commits May 24, 2019 14:09
@tdipisa tdipisa merged commit 7edadab into master May 30, 2019
@tdipisa tdipisa removed the Blocked label May 30, 2019
@tdipisa tdipisa deleted the c125_annotations branch February 17, 2021 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge c125_annotation branch into master
7 participants