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

Merge mapgeojson in integration #502

Merged
merged 177 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
940681c
Integration of MapGeoJSON widget : #87
errahalm Nov 30, 2023
9791bdd
issue #87, Template : geojson-point-awesome-marker
errahalm Dec 5, 2023
9629409
issue #87, Template : osm-geojson-points-map
errahalm Dec 5, 2023
dad16aa
issue #87, Template : osm-geojson-lines-map
errahalm Dec 5, 2023
db338f6
issue #87, Template : osm-geojson-line-map
errahalm Dec 5, 2023
f89aa1f
issue #87, Template : osm-geojson-polygon-map
errahalm Dec 5, 2023
05fe572
issue #87, Template :osm-basic-geojson-map
errahalm Dec 5, 2023
a4045b9
#87 : tile server + color scale
errahalm Dec 14, 2023
c5568c4
issue #87, Template heat map view
errahalm Dec 14, 2023
8b7aa8c
issue #87, Template choropleth js
errahalm Dec 14, 2023
4de928d
issue #87, Template heat map view
errahalm Dec 14, 2023
71bb788
issue #87 toggle legend
errahalm Dec 14, 2023
20e1b7d
issue 87 , rename layers from style
errahalm Dec 15, 2023
31434d3
issue #87 template line heat map
errahalm Dec 15, 2023
7c82766
issue #87 MAJ des templates heat map and choropleth
errahalm Dec 15, 2023
109274a
fix:toggle legend #87
errahalm Jan 8, 2024
eebb24b
refactor : issue #87
errahalm Jan 8, 2024
6e980c7
refactor issue #87
errahalm Jan 8, 2024
35083c1
feat: mouseover and mouseout events
errahalm Jan 11, 2024
98acff8
SaaS extra files FIRST and PRINCIPAL commit!
bengaid Jan 18, 2024
916106a
solve merge conflicts
bengaid Jan 19, 2024
cc84429
global application of prettier
bengaid Jan 19, 2024
7d06019
solve merge conflicts
bengaid Jan 19, 2024
f6fc66b
issue #87 rajouter la liste des choix des propriétés dans tooltip
errahalm Jan 24, 2024
0d1b852
click event
errahalm Jan 30, 2024
ea9c001
click event (double click)
errahalm Feb 2, 2024
78de274
Merge remote-tracking branch 'github/main' into main-saas
bengaid Feb 6, 2024
be0278e
legend title
errahalm Feb 15, 2024
73f96be
radio buttons, save the seleced element
errahalm Feb 16, 2024
a3cf441
clik two time on polygon : reset selected value
errahalm Feb 16, 2024
547b5d5
fix: debug legends
errahalm Feb 28, 2024
3fe33a8
handle multiple legends #87
errahalm Mar 7, 2024
d99b0eb
add color scale : containing scheme , css colors
errahalm Mar 15, 2024
e395af5
show last legend : choroplet issue #87
errahalm Mar 15, 2024
fce01fc
add image overlay to each layer
errahalm Mar 15, 2024
3d456d4
xprjson Point #87
errahalm Mar 15, 2024
8c354e9
xprjson : osm-geojson-point-awesome-marker-final #4
errahalm Mar 15, 2024
a04cbcd
xprjson: osm-geojson-points-final #4
errahalm Mar 15, 2024
b56856e
add layer title
errahalm Mar 15, 2024
5e37a09
add title layer #4
errahalm Mar 15, 2024
4ee26a5
image overlay
errahalm Mar 21, 2024
ef093ee
osm-chropleth
errahalm Mar 21, 2024
2996c0b
refactor : get fill Color
errahalm Mar 29, 2024
6907538
Polygon
errahalm Mar 29, 2024
8b0c055
debug choroplet
errahalm Mar 29, 2024
54245ee
debug line String
errahalm Mar 29, 2024
fb9d03f
valeurs par défauts (couleurs) + légendes
errahalm Mar 29, 2024
c6ace60
lines debug
errahalm Apr 3, 2024
38abc21
debug points
errahalm Apr 4, 2024
f60019f
debug points
errahalm Apr 4, 2024
d718597
fix: style properties
errahalm Apr 5, 2024
2ed724f
add default center
errahalm Apr 5, 2024
637ab74
default config image overlay
errahalm Apr 5, 2024
c1b0885
default bounding box + zoom
errahalm Apr 5, 2024
42d4874
fix preview bug
abirEF Apr 5, 2024
e89ffd4
Merge branch 'main-saas' into issue_87_gitlab
abirEF Apr 5, 2024
042a4ba
debug Lines
errahalm Apr 9, 2024
4b17535
Revert "Merge branch 'main-saas' into issue_87_gitlab"
abirEF Apr 9, 2024
5e856cf
Merge branch 'issue_87_gitlab' of https://gitlabpremium.ifpen.fr/r11/…
errahalm Apr 9, 2024
47da5c1
updated templates
errahalm Apr 19, 2024
a525de6
refactor: get Color from style
errahalm Apr 19, 2024
e02498e
refactor colors
errahalm Apr 19, 2024
89c38fd
create template style
errahalm Apr 19, 2024
4a88a30
refactor:extract createTemplateStyle and setStyle
errahalm Apr 19, 2024
7f4228b
extract event manager
errahalm Apr 19, 2024
d24ab80
mouse over MultiPolygon
errahalm Apr 19, 2024
38b77bd
extract mouseoutHandler case Multipolygon
errahalm Apr 19, 2024
908c301
extract click event handler
errahalm Apr 19, 2024
b4f27f7
hadnle events case LineString
errahalm Apr 19, 2024
d510ff6
event for MiltiLineString
errahalm Apr 19, 2024
406412c
events circles
errahalm Apr 19, 2024
8d77d2e
refactor style polygon and lines
errahalm Apr 19, 2024
a8bc461
frefactor points
errahalm Apr 21, 2024
b642e5e
debug legends
errahalm Apr 21, 2024
0eccb7c
Layer group
errahalm Apr 21, 2024
7872de3
refactor cluster
errahalm Apr 24, 2024
2acacb5
fix: setStyle not defined
errahalm Apr 24, 2024
e2baa71
awesome marker parametrage
errahalm Apr 24, 2024
6286b8f
fix : change geojson and style
errahalm Apr 27, 2024
cb68818
change zoomControl position to topRight
errahalm Apr 27, 2024
26310f6
values legend chropolet
errahalm Apr 27, 2024
a798baf
update geojson and style
errahalm Apr 30, 2024
43a236a
Merge branch 'integration-test' into test-merge
abirEF May 2, 2024
2a3885e
examples
abirEF May 2, 2024
9f96a7f
update jsFile and rename file
abirEF May 2, 2024
9ac145c
add mapgeojson in widget list
abirEF May 2, 2024
9289170
fix bug: test on existence of style[index]
abirEF May 2, 2024
af06178
fix bug: add test
abirEF May 2, 2024
47fca48
fix bug: persistence of personalized styles (length, type,...)
abirEF May 3, 2024
c0f3f7c
Merge branch 'integration-test' into mapgeojson
abirEF May 3, 2024
fc5af21
set zoom position
errahalm May 8, 2024
acea5fb
toggle enable tooltip
errahalm May 8, 2024
d815830
default_tooltip instead of "none"
errahalm May 8, 2024
3b8ec03
refactor toggle legends
errahalm May 8, 2024
cd35981
toggle legend property
errahalm May 8, 2024
e23a1d3
fix: style click event
errahalm May 8, 2024
f64b42b
refactor show Legend
errahalm May 8, 2024
b4fc0e0
add dash array to lines
errahalm May 8, 2024
46666ed
refactor create style
errahalm May 8, 2024
1009728
fix:bbox bounds error
errahalm May 16, 2024
d577036
add securities : geojson empty
errahalm May 16, 2024
8575f0d
hide legend ic case of pointAreMarker is true
errahalm May 16, 2024
9a8cf0f
make markerCluster true by default
errahalm May 16, 2024
ba629ee
Merge remote-tracking branch 'github/main' into test
abirEF May 22, 2024
3e84ce9
update version
abirEF May 22, 2024
1d94ece
update env.prod
abirEF May 23, 2024
f79367b
fix bug in decoding html entities
abirEF May 23, 2024
7e18a22
fix: legend digists
errahalm Oct 11, 2024
e27b496
formattage legends
errahalm Oct 11, 2024
5c2ee29
add formatter
errahalm Oct 11, 2024
903059f
Merge branch 'mapgeojson' of https://github.com/ifpen/chalk-it-saas i…
errahalm Oct 11, 2024
5e6d3ab
MAJ Style + verify check if geojson is valid
errahalm Oct 14, 2024
24eb231
format file
errahalm Oct 14, 2024
ab33bb3
Merge branch 'mapgeojson' into merge-mapgeojson-in-integration
abirEF Oct 21, 2024
6fee62f
migrate mapgoejson files
abirEF Oct 21, 2024
ed83dc3
add mapgeojson widget
abirEF Oct 21, 2024
54812fa
fix:imports issues
errahalm Oct 22, 2024
59e80e7
fix import issues
errahalm Oct 22, 2024
e960e8b
fix leaflet icon pb for shadow and 2x with webpack
bengaid Nov 5, 2024
14c9282
Merge branch 'integration' into merge-mapgeojson-in-integration
bengaid Nov 5, 2024
7cc15f1
latest main features
bengaid Nov 7, 2024
d270928
debug points
errahalm Nov 11, 2024
2ed619f
refactor update style
errahalm Nov 13, 2024
317c476
fix: identation issue
errahalm Nov 13, 2024
78861ab
fix issue double click color
errahalm Nov 13, 2024
ae9560f
debug colors
errahalm Nov 14, 2024
f6fe004
refactor code
errahalm Nov 14, 2024
328a833
refactor code
errahalm Nov 14, 2024
2b7c1ca
refactor color scale
errahalm Nov 14, 2024
27c4f46
refactor get color
errahalm Nov 14, 2024
88114d4
get color scale manager
errahalm Nov 14, 2024
a835d11
opacity lines
errahalm Nov 14, 2024
b2d2eeb
solve merge conflicts
bengaid Nov 14, 2024
b2d6fc1
version upgrade
bengaid Nov 14, 2024
944da2a
remove gap choropleth
errahalm Nov 22, 2024
9ccaf29
refactor createChoroplethLegend
errahalm Nov 22, 2024
4618782
refactor
errahalm Nov 22, 2024
6468d86
fix refactor issue
errahalm Nov 22, 2024
28b1df6
edge case : GeoJSONStyle is null
errahalm Nov 22, 2024
bee9b80
add default style
errahalm Nov 22, 2024
9556a26
set default weight to 2
errahalm Nov 22, 2024
475a6d0
add setView in render
errahalm Nov 22, 2024
8cfc893
add default style
errahalm Nov 22, 2024
32d7746
use let instead of var
errahalm Nov 22, 2024
ff7537e
starting doc of geojson widget
errahalm Nov 24, 2024
21d0b84
doc Map geojson
errahalm Nov 24, 2024
807180f
doc
errahalm Nov 25, 2024
99325b7
upgrade version
errahalm Nov 25, 2024
f9d2a83
if no properties not show tooltip
errahalm Nov 25, 2024
f427bd9
update text in python api #372
abirEF Nov 26, 2024
6f9604c
Add python api in doc
abirEF Nov 26, 2024
eb9cadb
update js apis #372
abirEF Nov 26, 2024
4745128
enhance apis doc #372
abirEF Nov 26, 2024
c5c7831
Add js notification apis #372
abirEF Nov 26, 2024
929d041
little fix #372
abirEF Nov 27, 2024
164a88b
Merge pull request #443 from ifpen/372-write-the-documentation-of-the…
bengaid Nov 27, 2024
5ed07e0
Merge branch 'main' into integration
bengaid Nov 27, 2024
1482f9e
add missing png in the doc #372
abirEF Dec 2, 2024
a3a75ea
Merge branch 'main' into integration
bengaid Dec 2, 2024
4d132af
Merge branch 'integration' of https://github.com/ifpen/chalk-it into …
bengaid Dec 2, 2024
e285200
Merge branch 'main' into integration
bengaid Dec 19, 2024
b5e685b
refactor: files names
errahalm Jan 7, 2025
784443c
refactor config
errahalm Jan 20, 2025
8a4d9ab
fix default zoom issue
errahalm Jan 20, 2025
f71a693
fix zoom issue
errahalm Jan 20, 2025
ae9c95d
debug setStyle
errahalm Jan 20, 2025
07fd13d
refactor render function
errahalm Jan 20, 2025
7a8132d
fix refactor issues
errahalm Jan 20, 2025
496c423
geojson map doc
errahalm Jan 20, 2025
4c58fb5
Merge branch 'main' into integration
bengaid Jan 21, 2025
74ee819
solve merge conflicts
bengaid Jan 21, 2025
254d27f
prettier global application
bengaid Jan 21, 2025
c4a3fd5
merge with main, to be contd
bengaid Jan 22, 2025
ed0850e
solve merge conflicts
bengaid Feb 14, 2025
7507be5
Merge branch 'main' into merge-mapgeojson-in-integration
bengaid Feb 14, 2025
67525fe
uniformization
bengaid Feb 14, 2025
9988302
uniformization
bengaid Feb 14, 2025
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
18 changes: 9 additions & 9 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,14 @@

Copyright [2016-2024] [IFP Energies nouvelles]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Binary file added documentation/docs/wdg/image-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documentation/docs/wdg/image-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documentation/docs/wdg/image-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documentation/docs/wdg/image-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documentation/docs/wdg/image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,687 changes: 1,687 additions & 0 deletions documentation/docs/wdg/maps/osm-geojson-choropleth-events.xprjson

Large diffs are not rendered by default.

222 changes: 222 additions & 0 deletions documentation/docs/wdg/maps/osm-geojson-choropleth.xprjson

Large diffs are not rendered by default.

Loading
Loading