Commits

Daniel Endresen authored cb4d17a5625 Merge
Pull request #52: NVDBDOVUTV-378 import api url lenke

Merge in NVDBDOV/nvdb-qgis-plugin from NVDBDOVUTV-378-import-api-url-lenke to Dev * commit '54d60982be50820cf405b41853ef982a9fda74f1': NVDBDOVUTV-378: fixed faulty test url NVDBDOVUTV-378: added a method import_handle_egenskap_verdi_textornum so that we the feature works with number and text input. Also changed name to avansert filtrering, and changed some button controls NVDBDOVUTV-378: removed prints NVDBDOVUTV-378: made AreaGeoDataParser update the env. And added ux improvements NVDBDOVUTV-378: removed print NVDBDOVUTV-378: changed name from bruk api lenke to avansert filtrering NVDBDOVUTV-378: changed name from importer med lenke to avansert filtrering NVDBDOVUTV-378: added icon for advanced filtering tab NVDBDOVUTV-378: fixed test for filter input NVDBDOVUTV-378: removed prints NVDBDOVUTV-378: removed self.source_data = nvdbFagdata(nvdbId) in get_import_data_fromMoreWindow() NVDBDOVUTV-378: fixed filter input to take in everything except type and kartutsnitt NVDBDOVUTV-378: changed import from vegobjekt parser, to advanced filtering NVDBDOVUTV-378: fixed split_egenskap_into_array method. Now can add several egenskaper and several relasjoner NVDBDOVUTV-378: fixed test case for filter_input NVDBDOVUTV-378: big changes, added a lot of button control, and fixed a lot of bugs NVDBDOVUTV-378: big changes, a lot of bugfixing and changing the way we format the queries. Now if is more safe. Multiple egenskaper works in relasjon, but not overlapp NVDBDOVUTV-378: fixed some of the tests, after doing bugfixing on the vegobjekt_parser, and source_more_window NVDBDOVUTV-378: fixed some of the testing url's
No tags

test/config_t.py

Modified
180 180 @pytest.fixture
181 181 def url_parser_list_instance():
182 182 urlList = [
183 183 #fylke test
184 184 'https://nvdbapiles-v3.test.atlas.vegvesen.no/vegobjekter/581?segmentering=true&fylke=11%2C46&srid=5973&inkluder=alle',
185 185 #kommune test
186 186 'https://nvdbapiles-v3.test.atlas.vegvesen.no/vegobjekter/581?segmentering=true&kommune=1106%2C1149&srid=5973&inkluder=alle',
187 187 #egenskap test
188 188 'https://nvdbapiles-v3.test.atlas.vegvesen.no/vegobjekter/470?segmentering=true&egenskap=(3779%3D4822)',
189 189 #overlapp test
190 - 'https://nvdbapiles-v3.atlas.vegvesen.no/vegobjekter/581?overlapp=105(egenskap(2021)=2738)&overlapp=978(egenskap(12612)=21771)',
190 + 'https://nvdbapiles-v3.atlas.vegvesen.no/vegobjekter/581?overlapp=105(2021=2738)&overlapp=978(12612=21771)',
191 191 #srid test
192 192 'https://nvdbapiles-v3.test.atlas.vegvesen.no/vegobjekter/581?srid=5973',
193 193 #relasjoner test
194 194 'https://nvdbapiles-v3.test.atlas.vegvesen.no/vegobjekter/581?egenskap=relasjon(67,relasjon(591,egenskap(5277)%3E4))%20AND%20(8945%3C2000)',
195 195 #segmentering test
196 196 'https://nvdbapiles-v3.test.atlas.vegvesen.no/vegobjekter/581?segmentering=true',
197 197 #vegsystemreferanse test
198 198 'https://nvdbapiles-v3.test.atlas.vegvesen.no/vegobjekter/581?vegsystemreferanse=EV',
199 199 #overlapp, flere egenskaper
200 - 'https://nvdbapiles-v3.atlas.vegvesen.no/vegobjekter/581?overlapp=978(egenskap(12612)=21771)%20AND%20(8945%3C2000)',
200 + 'https://nvdbapiles-v3.atlas.vegvesen.no/vegobjekter/581?overlapp=978(egenskap(12612)=21771)&egenskap=(8945%3C2000)',
201 201 #alle, flere egenskaper
202 - 'https://nvdbapiles-v3.atlas.vegvesen.no/vegobjekter/581?overlapp=978(egenskap(12612)=21771)&egenskap=(3779%3D4822)%20AND%20egenskap=relasjon(67,relasjon(591,egenskap(5277)%3E4))%20AND%20(8945%3C2000)'
202 + 'https://nvdbapiles-v3.atlas.vegvesen.no/vegobjekter/581?overlapp=978(12612=21771)&egenskap=(3779=4822)%20AND%20relasjon(67,relasjon(591,(5277<4))%20AND%20(8945=2000)'
203 203 ]
204 204 return urlList
205 205
206 206 @pytest.fixture
207 207 def validate_slett_forelder_endringssett() -> bool:
208 208 def validate(xml_form):
209 209
210 210 try:
211 211 schema_base_path = "schemas/"
212 212

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut