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

3127 merging annotations from c125_annotations branch #3137

Closed
wants to merge 57 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
c175edd
annotations updates for Openlayers (#2612)
MV88 Feb 16, 2018
a4e6689
Improved compatibility of openlayers DrawSupport between all the invo…
mbarto Feb 20, 2018
d3febc0
Fix Reproject Geometries drawsupport OL (#2627)
MV88 Feb 20, 2018
bb048ed
Closes geosolutions-it/austrocontrol-C125#12 (#2628)
kappu72 Feb 21, 2018
7824f66
Closes geosolutions-it/austrocontrol-C125#13 (#2633)
kappu72 Feb 27, 2018
c108aff
C125 annotations (#2647)
kappu72 Feb 27, 2018
fd27964
Fixes #2608: custom mapOptions are not saved with maps (#2609)
mbarto Feb 15, 2018
147ba24
Added current annotation export Closes geosolutions-it/austrocontrol-…
kappu72 Mar 2, 2018
45cad05
Align master to c125_annotations (#2706)
MV88 Mar 6, 2018
82e6ec2
Fix #2709 minor fixes to annotations and measure tool (#2710)
MV88 Mar 7, 2018
708ea9a
Fix #2531 notes (#2716)
MV88 Mar 8, 2018
3fee329
Added circles on annotation (#2724)
MV88 Mar 12, 2018
67ef847
Merge branch 'master' into align_master_mar12
MV88 Mar 12, 2018
2c4d30b
Merge pull request #2732 from MV88/align_master_mar12
MV88 Mar 13, 2018
51a60e1
Fixed some bugs / added improvements on circle annotation
MV88 Mar 14, 2018
d3f4c65
fixed test
MV88 Mar 14, 2018
7c2862d
Merge pull request #2744 from MV88/fix_circle_bugs
MV88 Mar 15, 2018
6672f19
Fix translate interactions on openlayers and other issues on 2709 (#2…
MV88 Mar 19, 2018
6276150
C125 annotations (#2751)
kappu72 Mar 19, 2018
e262ccc
C125 annotations (#2757)
kappu72 Mar 21, 2018
9be3635
fix #2709 annotations editor layout (#2897)
MV88 May 16, 2018
5c35a67
49 great circle annotations (#2875)
MV88 May 16, 2018
51dda97
fix #2879 add highlight for text annotations (#2880)
MV88 May 16, 2018
e4f24bf
Fix #2858 change label for annotations text style (#2860)
MV88 May 16, 2018
30c6d1c
Fixed color style in pdf print (#2792)
mbarto May 17, 2018
3b111be
Include printing fixes from master and fix the color of line vector w…
mbarto May 18, 2018
1f43df9
Align master on c125_annotations branch (#2923)
MV88 May 18, 2018
e75eec9
merge
mbarto May 18, 2018
5a403ea
Fixed a couple of typos in merge
mbarto May 18, 2018
05630df
Merge branch 'master' into 2922_align_210518
MV88 May 21, 2018
0561169
fix failing tests
MV88 May 22, 2018
415b07f
Merge pull request #2937 from MV88/2922_align_210518
MV88 May 22, 2018
07f1d0c
Fix #2951 circle draw and styles annotations (#2952)
MV88 May 29, 2018
389ad86
Support for time dimension (#2968)
offtherailz Jun 4, 2018
5d2212e
Support for TOC indicators (#2974)
offtherailz Jun 4, 2018
f276fc9
2984 upload coordinates editor for annotations (#2988)
MV88 Jun 8, 2018
4d6c2c5
Fix #2990 solve problem to import/export and print for annotation (#2…
MV88 Jun 11, 2018
4bcc399
Fix #2987 wrong ol default style for linestrings (green 1 -> blue 3) …
mbarto Jun 11, 2018
c57a9f9
fixed #2990 custom styles plus tests (#2998)
MV88 Jun 11, 2018
a0b07f7
Fix #2984 Update coordinate editor and bugfixing (#3003)
MV88 Jun 13, 2018
42fc178
Support for import / export map (branch c125_annotation) (#3004)
offtherailz Jun 14, 2018
877ed31
Add aeronautical degree in the annotation coordinate editor (#3005)
MV88 Jun 15, 2018
2f62795
FIX STYLE DRAG DROP AERONAUTICAL (#3006)
MV88 Jun 15, 2018
77cb855
Fix bugs of coordinate editor for annotations (#3012)
MV88 Jun 19, 2018
fad1431
Fix #1. Imcreased drag zone opacity to 0.75
offtherailz Jun 19, 2018
a5745bf
Re arranged strings and items in burger menu
offtherailz Jun 19, 2018
0ae6ea7
Update data.en-US
offtherailz Jun 21, 2018
09b42c5
Support for external close action for identify (#3027)
offtherailz Jun 22, 2018
c8aba73
Fix c125_75 Aeronautical Coordinate issues (#3030)
offtherailz Jun 25, 2018
3dd157b
Fix #73 Fix #76 Fix #77 Fix #80 Fix #81 various issue on c125 project…
MV88 Jun 26, 2018
875d4d6
Add unit of measure to circle annotation radius (#3033)
offtherailz Jun 26, 2018
c54dd3c
add authenticationRule to support browser credentials (i.e. Cookies).…
FlorianBruckner Jun 26, 2018
5c2fead
Fix c125/89. GFI and annotations fixes (#3035)
MV88 Jun 28, 2018
f597d96
Fix #3045 parsing of provider for tileProvider (#3054) (#3055)
MV88 Jul 9, 2018
e3ce19a
Merge branch 'c125_annotations' into 3127_merging_annotations
MV88 Aug 1, 2018
f29f4c8
Fixed failing test
MV88 Aug 2, 2018
ad4ada0
various fixes
MV88 Aug 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix #2709 minor fixes to annotations and measure tool (#2710)
MV88 authored Mar 7, 2018
commit 82e6ec2471c0744f9b4fc9de1392e221f973aab2
Original file line number Diff line number Diff line change
@@ -239,7 +239,12 @@ class AnnotationsEditor extends React.Component {
visible: true,
onClick: () => {
if (this.props.unsavedChanges) {
this.props.onToggleUnsavedChangesModal();
const errors = this.validate();
if (Object.keys(errors).length === 0) {
this.props.onToggleUnsavedChangesModal();
} else {
this.props.onError(errors);
}
} else {
this.cancelEdit();
}}
2 changes: 1 addition & 1 deletion web/client/components/style/TextStyler.jsx
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ class TextStyler extends React.Component {
uomValues: [{value: "px"}, {value: "em"}],
fontWeightValues: [{value: "normal"}, {value: "bold"}],
alignValues: [{value: "start"}, {value: "center"}, {value: "end"}],
fontStyleValues: [{value: "start"}, {value: "center"}, {value: "end"}],
fontStyleValues: [{value: "normal"}, {value: "italic"}],
fontFamilyValues: [{value: "Arial"}, {value: "FontAwesome"}, {value: "Courier"}],
shapeStyle: {},
setStyleParameter: () => {}
6 changes: 4 additions & 2 deletions web/client/reducers/measurement.js
Original file line number Diff line number Diff line change
@@ -86,7 +86,8 @@ function measurement(state = defaultState, action) {
lineMeasureEnabled: false,
areaMeasureEnabled: false,
bearingMeasureEnabled: false,
feature: {}
feature: {},
geomType: ""
};
}
}
@@ -99,7 +100,8 @@ function measurement(state = defaultState, action) {
lineMeasureEnabled: false,
areaMeasureEnabled: false,
bearingMeasureEnabled: false,
feature: {}
feature: {},
geomType: ""
};
}
default: