Retrieve spatialDataColumn in TableWidget for its future usage #900
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| if [ -z "$1" ]; then | ||
| echo "Missing target directory. Usage: $0 <target_dir>" | ||
| exit 1 | ||
| fi | ||
|
|
||
| SOURCE_DIR="packages" | ||
| TARGET_DIR="$1" | ||
|
|
||
| for dir in "$SOURCE_DIR"/*; do | ||
| if [ -d "$dir" ]; then | ||
| DIR_NAME=$(basename "$dir") | ||
|
|
||
| SOURCE_PATH="$dir/dist" | ||
| TARGET_PATH="$TARGET_DIR/$DIR_NAME" | ||
|
|
||
| echo "Copying $SOURCE_PATH to $TARGET_PATH" | ||
| cp -r "$SOURCE_PATH" "$TARGET_PATH" | ||
| fi | ||
| done | ||
|
|
||
| echo "All directories copied successfully!" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,33 @@ const AVAILABLE_MODELS = [ | |
|
|
||
| const DEFAULT_GEO_COLUMN = 'geom'; | ||
|
|
||
| const extractSpatialDataFromSource = (source) => { | ||
| let spatialDataType = source.spatialDataType; | ||
| let spatialDataColumn = source.spatialDataColumn; | ||
|
|
||
| if (!spatialDataType || !spatialDataColumn) { | ||
| if (source.geoColumn) { | ||
| const parsedGeoColumn = source.geoColumn.split(':'); | ||
| if (parsedGeoColumn.length === 2) { | ||
| spatialDataType = parsedGeoColumn[0]; | ||
| spatialDataColumn = parsedGeoColumn[1]; | ||
| } else if (parsedGeoColumn.length === 1) { | ||
| spatialDataColumn = parsedGeoColumn[0] || DEFAULT_GEO_COLUMN; | ||
| spatialDataType = 'geo'; | ||
| } | ||
| if (spatialDataType === 'geom') { | ||
| // fallback if for some reason someone provided old `geom:$column` | ||
| spatialDataType = 'geo'; | ||
| } | ||
| } else { | ||
| spatialDataType = 'geo'; | ||
| spatialDataColumn = DEFAULT_GEO_COLUMN; | ||
| } | ||
| } | ||
|
|
||
| return { spatialDataType, spatialDataColumn }; | ||
| }; | ||
|
|
||
| /** | ||
| * Execute a SQL model request. | ||
| * | ||
|
|
@@ -56,6 +83,7 @@ export function executeModel(props) { | |
| const queryParameters = source.queryParameters | ||
| ? JSON.stringify(source.queryParameters) | ||
| : ''; | ||
|
|
||
| let queryParams = { | ||
| type, | ||
| client: _getClient(), | ||
|
|
@@ -67,29 +95,8 @@ export function executeModel(props) { | |
| }; | ||
|
|
||
| let spatialFilters; | ||
| if (spatialFilter || props.model === 'table') { | ||
| const { spatialDataType, spatialDataColumn } = extractSpatialDataFromSource(source); | ||
|
|
||
| // API supports multiple filters, we apply it only to geometry column or spatialDataColumn | ||
| spatialFilters = spatialFilter | ||
|
|
@@ -98,8 +105,10 @@ export function executeModel(props) { | |
| } | ||
| : undefined; | ||
|
|
||
| if (spatialFilters) queryParams.spatialFilters = JSON.stringify(spatialFilters); | ||
| if (spatialDataType) queryParams.spatialDataType = spatialDataType; | ||
| if (spatialDataColumn) queryParams.spatialDataColumn = spatialDataColumn; | ||
|
There was a problem hiding this comment. This only specifies which is the |
||
|
|
||
| if (spatialDataType !== 'geo') { | ||
| if (source.spatialFiltersResolution !== undefined) { | ||
| queryParams.spatialFiltersResolution = source.spatialFiltersResolution; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zbigg I've added this, as we both sometimes copy&paste content for the seek of pragmatism when developing things on Carto4React and testing them on cloud-native 😄