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

Update arcgis pro tool #39

Draft
wants to merge 72 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
c5d4564
Back end ontwikkelingen #1
ruben123zaag Aug 5, 2024
d22e189
Wijzigingen aan save_to_gpkg function core inlooptool
ruben123zaag Aug 8, 2024
703fde1
Reset knop input parameters
ruben123zaag Aug 8, 2024
6721478
Front end updates
ruben123zaag Aug 12, 2024
a05707e
Resultaten oude run inladen en automatisch revisiebeheer
ruben123zaag Aug 13, 2024
de195c8
Update statisieken berekenen, rekeninstellingen en waterpasserende ve…
ruben123zaag Aug 14, 2024
6d52fa0
Download BAG geïmplementeerd
ruben123zaag Aug 21, 2024
5958173
Ook GWSW api download (via PDOK)
ruben123zaag Aug 21, 2024
5d7a99f
Update in calculate statistics
ruben123zaag Aug 22, 2024
f76513e
Controle laag aangemaakt. Nu alleen controle op grote oppervlakken.
ruben123zaag Aug 23, 2024
24a19b1
Kleine aanpassing voor INF_PAVEMENT_TABLE_NAME_PREV
ruben123zaag Aug 23, 2024
d6eb418
Update warnings
ruben123zaag Sep 11, 2024
b62af3e
GWSW download update
ruben123zaag Sep 12, 2024
38ae8ae
Update on GWSW en BAG download
ruben123zaag Sep 17, 2024
a660902
Leidingcodes koppelen aan vlakken
ruben123zaag Sep 18, 2024
a3f7558
Update leidingcodes koppelen
ruben123zaag Sep 19, 2024
7735148
Update in gpkg om styling goed te krijgen
ruben123zaag Sep 20, 2024
79fa4ee
template output gpkg opgeschoond.
ruben123zaag Sep 24, 2024
0a0c751
Nieuwe update template_output.gpkg
ruben123zaag Sep 24, 2024
79511a6
Output gpkg gefixt (was een probleem met spatial indexing)
ruben123zaag Sep 25, 2024
496a9a3
Leidingcodes koppelen incl. UI aanpassingen en validate bgt, bag en g…
ruben123zaag Sep 26, 2024
9db7201
Tool versnellen: omgaan met gml vector tiles van BGT download
ruben123zaag Oct 8, 2024
d0ead66
Extents with multiple features can be used --> dissolved to multipoly…
ruben123zaag Oct 8, 2024
7ffa99c
Waarschuwingen toegevoegd
ruben123zaag Oct 18, 2024
4eae990
Relatieve hoogteligging van vlakken nu als waarschuwing
ruben123zaag Oct 21, 2024
2443dd6
Feedback Reinout verwerkt
ruben123zaag Oct 24, 2024
8b79fda
Optimalisatie van calculate statistics
ruben123zaag Oct 29, 2024
9abac98
Update generate warning
ruben123zaag Nov 4, 2024
891cf60
Styling gpkgs en qmls geüpdatet
ruben123zaag Nov 5, 2024
2ccc0ca
Info toegevoegd aan tool
ruben123zaag Nov 7, 2024
0f45421
Download BAG panden verbeterd (meldingen), rtree gefixt QGIS en revis…
ruben123zaag Nov 12, 2024
9ec79fe
To do weggehaald (alles is uitgevoerd)
ruben123zaag Nov 12, 2024
96559de
Merge branch 'master' into Z0141_doorontwikkeling_backend_1
ruben123zaag Nov 13, 2024
f8989dd
Update constants.py (resolved conflicts PR)
ruben123zaag Nov 13, 2024
ca052ca
Merge branch 'master' into Z0141_doorontwikkeling_backend_1
leendertvanwolfswinkel Nov 19, 2024
0bdff98
explicit and absolute
leendertvanwolfswinkel Nov 19, 2024
25fca17
Merge pull request #38 from nens/leendert-explicit-and-absolute-imports
ruben123zaag Nov 19, 2024
adc81a4
Alle imports from constants meegenomen
ruben123zaag Nov 19, 2024
6bcdf05
update core
Vincentvd-T Nov 27, 2024
ba2901a
fix imports
Vincentvd-T Nov 27, 2024
d5c21cd
add paramerters to basis data downloader
Vincentvd-T Nov 27, 2024
73278eb
restructure parameters
Vincentvd-T Nov 27, 2024
27722a1
Add new core parameters
Vincentvd-T Nov 27, 2024
4b36b51
add reset button
Vincentvd-T Nov 27, 2024
3ac390b
Update tool metadata
Vincentvd-T Nov 27, 2024
2617f53
metadata
Vincentvd-T Nov 27, 2024
55b8dc8
update layer files
Vincentvd-T Nov 28, 2024
4e28f24
Add statistics test data
Vincentvd-T Nov 28, 2024
f5770c8
Connect tool to new core
Vincentvd-T Nov 28, 2024
78f9e6f
work on downloading base data
Vincentvd-T Nov 28, 2024
9a2545b
restructure folder and fix downloading base data
Vincentvd-T Nov 29, 2024
c5a643c
fix basisdata download bug
Vincentvd-T Nov 29, 2024
e8f7e4c
added tool info
Vincentvd-T Nov 29, 2024
9f3a015
Punten en spaties in tabelnamen verwijderd (relevant voor AGP)
ruben123zaag Dec 2, 2024
6551ff6
Merge remote-tracking branch 'origin/Z0141_doorontwikkeling_backend_1…
Vincentvd-T Dec 2, 2024
109dbd9
update gpkg table names
Vincentvd-T Dec 2, 2024
c229242
Update download BGT from api
ruben123zaag Dec 5, 2024
f78af75
Merge remote-tracking branch 'origin/Z0141_doorontwikkeling_backend_1…
Vincentvd-T Dec 6, 2024
6fe00ff
Add gpkg template files with new names
Vincentvd-T Dec 6, 2024
adf0930
start with showing correct symbology
Vincentvd-T Dec 6, 2024
3eb07d7
add layers as gpkg
Vincentvd-T Dec 9, 2024
6447ee4
work on fixing symbology
Vincentvd-T Dec 9, 2024
fe93634
visualize layers
Vincentvd-T Dec 9, 2024
d79d40f
restructure the way layers are added and visualized
Vincentvd-T Dec 10, 2024
496bed0
change layer order
Vincentvd-T Dec 10, 2024
7dc9d51
split visualisation function
Vincentvd-T Dec 10, 2024
9727a28
added docs
Vincentvd-T Dec 11, 2024
64ff960
fix statistieken symbologie
Vincentvd-T Dec 11, 2024
352e49c
template gpkg aangepast
ruben123zaag Dec 12, 2024
86a0f1f
black code
Vincentvd-T Dec 12, 2024
56ec15f
set parameter to optional
Vincentvd-T Dec 13, 2024
5bb0c29
Merge remote-tracking branch 'origin/Z0141_doorontwikkeling_backend_1…
Vincentvd-T Dec 13, 2024
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
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ ArcGIS_plugin/bgt_inlooptool/rtree/finder.py
ArcGIS_plugin/bgt_inlooptool/rtree/index.py
ArcGIS_plugin/bgt_inlooptool/rtree/lib/spatialindex-64.dll
ArcGIS_plugin/bgt_inlooptool/rtree/lib/spatialindex_c-64.dll
.vscode/launch.json
.vscode/settings.json
.spyproject
.bak
plugin/bgtinlooptool/bgtinlooptool.zip
Expand Down
9 changes: 9 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"recommendations": [
"ms-python.black-formatter",
"ms-python.isort",
"aaron-bond.better-comments",
"davidanson.vscode-markdownlint",
"njpwerner.autodocstring"
]
}
16 changes: 16 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python: Current File",
"type": "debugpy",
"request": "launch",
"program": "${file}",
"console": "internalConsole",
"justMyCode": true
}
]
}
63 changes: 63 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"editor.rulers": [
120
],
"python.autoComplete.extraPaths": [
"C:\\OSGeo4W\\apps\\qgis-ltr\\bin",
"C:\\OSGeo4W\\apps\\Qt5\bin",
"C:\\OSGeo4W\\apps\\grass\\grass83\bin",
"C:\\OSGeo4W\\apps\\Python312\\Scripts",
"C:\\OSGeo4W\\apps\\qgis-ltr\\python",
],
"python.analysis.extraPaths": [
"C:\\OSGeo4W\\apps\\qgis-ltr\\bin",
"C:\\OSGeo4W\\apps\\Qt5\bin",
"C:\\OSGeo4W\\apps\\grass\\grass83\bin",
"C:\\OSGeo4W\\apps\\Python312\\Scripts",
"C:\\OSGeo4W\\apps\\qgis-ltr\\python",
"C:\\Users\\vdi\\.vscode\\extensions\\ms-python.python-2022.20.2\\pythonFiles\\lib\\python",
],
"python.defaultInterpreterPath": "C:\\OSGeo4W\\apps\\Python312\\python.exe",
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit",
"source.fixAll": "explicit",
"source.fixAll.unusedImports": "explicit"
},
"python.analysis.typeCheckingMode": "basic",
"python.testing.unittestArgs": [
"-v",
"-s",
"./tests",
"-p",
"test_*.py"
],
"python.testing.unittestEnabled": true,
"terminal.integrated.env.windows": {
"PYTHONPATH": "C:\\OSGeo4W\\apps\\qgis-ltr\\python\\qgis",
"PATH": "C:\\OSGEO4~1\\apps\\qgis-ltr\\bin;C:\\OSGEO4~1\\apps\\Python312;C:\\OSGEO4~1\\apps\\Python312\\Scripts;C:\\OSGEO4~1\\apps\\qt5\\bin;C:\\OSGEO4~1\\apps\\Python312\\Scripts;C:\\OSGEO4~1\\bin;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\system32\\WBem;C:\\OSGEO4~1\\apps\\Python312\\lib\\site-packages\\pywin32_system32;C:\\OSGEO4~1\\apps\\Python312\\lib\\site-packages\\numpy\\.libs",
"GDAL_DATA": "C:\\OSGEO4~1\\share\\gdal",
"GDAL_DRIVER_PATH": "C:\\OSGEO4~1\\bin\\gdalplugins",
"GDAL_FILENAME_IS_UTF8": "YES",
"GEOTIFF_CSV": "C:\\OSGEO4~1\\share\\epsg_csv",
"O4W_QT_BINARIES": "C:\\OSGEO4~1\\apps\\Qt5\\bin",
"O4W_QT_DOC": "C:\\OSGEO4~1\\apps\\Qt5\\doc",
"O4W_QT_HEADERS": "C:\\OSGEO4~1\\apps\\Qt5\\include",
"O4W_QT_LIBRARIES": "C:\\OSGEO4~1\\apps\\Qt5\\lib",
"O4W_QT_PLUGINS": "C:\\OSGEO4~1\\apps\\Qt5\\plugins",
"O4W_QT_PREFIX": "C:\\OSGEO4~1\\apps\\Qt5",
"O4W_QT_TRANSLATIONS": "C:\\OSGEO4~1\\apps\\Qt5\\translations",
"QT_PLUGIN_PATH": "C:\\OSGEO4~1\\apps\\qgis-ltr\\qtplugins;C:\\OSGEO4~1\\apps\\qt5\\plugins",
"QGIS_PREFIX_PATH": "C:\\OSGEO4~1\\apps\\qgis-ltr",
},
"markdownlint.config": {
"MD024": {
"siblings_only": true
}
},
"python.testing.pytestEnabled": false,
"workbench.settings.useSplitJSON": false,
}
2 changes: 1 addition & 1 deletion ArcGIS_plugin/BGTInloopToolbox.BGTInloopToolArcGIS.pyt.xml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions ArcGIS_plugin/BGTInloopToolbox.DownloadBasisData.pyt.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata xml:lang="nl"><Esri><CreaDate>20241127</CreaDate><CreaTime>13294300</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce></Esri></metadata>
14 changes: 6 additions & 8 deletions ArcGIS_plugin/BGTInloopToolbox.pyt
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@ Created By: Sjoerd Hoekstra
Date: 29/09/2020
"""

from bgt_inlooptool.bgt_inlooptool_ArcGIS import BGTInloopToolArcGIS
from bgt_inlooptool.download_bgt_vlakken import DownloadBGTVlakken
from bgt_inlooptool.pyt_bgt_inlooptool_arcgis import BGTInloopToolArcGIS
from bgt_inlooptool.pyt_download_basis_data import DownloadBasisData


class Toolbox(object):

def __init__(self):
self.label = 'BGT Inloop Toolbox voor ArcGIS'
self.alias = 'Toolbox'
self.description = 'BGT Inloop Toolbox voor ArcGIS'
self.label = "BGT Inloop Toolbox voor ArcGIS"
self.alias = "Toolbox"
self.description = "BGT Inloop Toolbox voor ArcGIS"

# Explicitly define tools here.
self.tools = [BGTInloopToolArcGIS, DownloadBGTVlakken]


self.tools = [BGTInloopToolArcGIS, DownloadBasisData]
2 changes: 1 addition & 1 deletion ArcGIS_plugin/BGTInloopToolbox.pyt.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
<metadata xml:lang="nl"><Esri><CreaDate>20201112</CreaDate><CreaTime>09370400</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><ModDate>20210510</ModDate><ModTime>16070500</ModTime><DataProperties><lineage><Process ToolSource="c:\program files\arcgis\pro\Resources\ArcToolbox\toolboxes\Data Management Tools.tbx\Rename" Date="20210510" Time="140850" Name="" export="">Rename C:\GitHub\bgt-inlooptool\ArcGIS_plugin\bgt_inloop_toolbox.pyt C:\GitHub\bgt-inlooptool\ArcGIS_plugin\BGTInloopToolbox.pyt #</Process></lineage></DataProperties><scaleRange><minScale>150000000</minScale><maxScale>5000</maxScale></scaleRange><ArcGISProfile>ItemDescription</ArcGISProfile></Esri><toolbox name="BGTInloopToolbox" alias="Toolbox"><arcToolboxHelpPath>c:\program files\arcgis\pro\Resources\Help\gp</arcToolboxHelpPath></toolbox><dataIdInfo><idCitation><resTitle>BGTInloopToolbox</resTitle></idCitation><idPurp>Deze toolbox kan worden gebruikt om de bgt inlooptool door te rekenen voor een gebied</idPurp><searchKeys><keyword>BGT inlooptool</keyword></searchKeys></dataIdInfo><distInfo><distributor><distorFormat><formatName>ArcToolbox Toolbox</formatName></distorFormat></distributor></distInfo><mdHrLv><ScopeCd value="005"/></mdHrLv><mdDateSt Sync="TRUE">20210510</mdDateSt></metadata>
<metadata xml:lang="nl"><Esri><CreaDate>20201112</CreaDate><CreaTime>09370400</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><ModDate>20241212</ModDate><ModTime>140142</ModTime><DataProperties><lineage><Process ToolSource="c:\program files\arcgis\pro\Resources\ArcToolbox\toolboxes\Data Management Tools.tbx\Rename" Date="20210510" Time="140850" Name="" export="">Rename C:\GitHub\bgt-inlooptool\ArcGIS_plugin\bgt_inloop_toolbox.pyt C:\GitHub\bgt-inlooptool\ArcGIS_plugin\BGTInloopToolbox.pyt #</Process></lineage></DataProperties><scaleRange><minScale>150000000</minScale><maxScale>5000</maxScale></scaleRange><ArcGISProfile>ItemDescription</ArcGISProfile></Esri><toolbox name="BGTInloopToolbox" alias="Toolbox"><arcToolboxHelpPath>c:\program files\arcgis\pro\Resources\Help\gp</arcToolboxHelpPath><toolsets/></toolbox><dataIdInfo><idCitation><resTitle>BGTInloopToolbox</resTitle></idCitation><idPurp>Deze toolbox kan worden gebruikt om de bgt inlooptool door te rekenen voor een gebied</idPurp><searchKeys><keyword>BGT inlooptool</keyword></searchKeys></dataIdInfo><distInfo><distributor><distorFormat><formatName>ArcToolbox Toolbox</formatName></distorFormat></distributor></distInfo><mdHrLv><ScopeCd value="005"/></mdHrLv><mdDateSt Sync="TRUE">20210510</mdDateSt></metadata>
Loading