Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
web-et-numerique
web-et-numerique-internet
data.grandlyon.com
web-portal
components
custom-apps
web-app
Commits
660ed84d
Commit
660ed84d
authored
Jun 16, 2021
by
Matthieu BENOIST
Browse files
Merge branch 'DOS0124802' into 'master'
Corrections on atmo download links and complex data array See merge request
!130
parents
4e985f28
2e983140
Pipeline
#14532
passed with stage
in 8 minutes and 55 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
package.json
View file @
660ed84d
{
"name"
:
"webapp"
,
"version"
:
"2.7.
3
"
,
"version"
:
"2.7.
4
"
,
"license"
:
"GNU Affero General Public License v3.0"
,
"scripts"
:
{
"ng"
:
"ng"
,
...
...
src/app/dataset-detail/components/dataset-data-details/dataset-data-details.component.ts
View file @
660ed84d
...
...
@@ -22,6 +22,12 @@ export class DatasetDataDetailsComponent implements OnInit {
}
catch
(
err
)
{
}
}
}
else
if
(
Array
.
isArray
(
properties
[
key
]))
{
try
{
const
parsed
=
JSON
.
parse
(
properties
[
key
]);
properties
[
key
]
=
parsed
;
}
catch
(
err
)
{
}
}
}
this
.
_properties
=
properties
;
}
...
...
src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts
View file @
660ed84d
...
...
@@ -152,6 +152,12 @@ export class ResourceDownloadItemComponent implements OnInit {
`
${
this
.
format
.
mapServerType
}
`
;
const
projectionAndBbox
=
this
.
getProjectionAndBbox
(
this
.
format
);
if
(
Array
.
isArray
(
this
.
metadata
.
providers
)
&&
this
.
metadata
.
providers
[
0
].
match
(
/ATMO/g
))
{
if
(
this
.
format
.
mapServerType
.
match
(
/application
\/
json/
))
{
outputFormat
=
`&
${
this
.
labelFormat
[
this
.
resource
.
type
]}
=GEOJSON`
;
}
}
const
baseParameters
=
this
.
resource
.
parametersUrl
?
`?
${
this
.
resource
.
parametersUrl
}
`
:
''
;
queryableUrl
+=
baseParameters
+
layer
+
...
...
src/app/dataset-detail/services/dataset-detail.service.ts
View file @
660ed84d
...
...
@@ -284,7 +284,8 @@ export class DatasetDetailService {
var
fieldtype
=
field
+
'
_
'
+
eval
(
`this._dataset.fields.types.
${
field
}
`
);
newDataPropertiesOrder
[
field
]
=
data
.
properties
[
fieldtype
]
?
data
.
properties
[
fieldtype
]
:
data
.
properties
[
field
]
?
data
.
properties
[
field
]
:
data
.
properties
[
`
${
field
}
_json`
]
?
data
.
properties
[
`
${
field
}
_json`
]
:
''
;
data
.
properties
[
`
${
field
}
_json`
]
:
data
.
properties
[
`
${
field
}
_str`
]
?
data
.
properties
[
`
${
field
}
_str`
]
:
''
;
});
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment