DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5155 from tchak/fix-apercu-carto

Browse source 
Fix map apercu
This commit is contained in:
Paul Chavard 2020-05-14 14:39:05 +02:00 committed by GitHub
commit ad6f5faf9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/javascript/components/MapEditor/index.js
View file

@ -23,7 +23,9 @@ function filterFeatureCollection(featureCollection, source) {
}; };
} }
const MapEditor = ({ featureCollection, url }) => { function noop() {}
function MapEditor({ featureCollection, url, preview }) {
const drawControl = useRef(null); const drawControl = useRef(null);
const [style, setStyle] = useState('ortho'); const [style, setStyle] = useState('ortho');
const [coords, setCoords] = useState([1.7, 46.9]); const [coords, setCoords] = useState([1.7, 46.9]);
@ -174,9 +176,9 @@ const MapEditor = ({ featureCollection, url }) => {
/> />
<DrawControl <DrawControl
ref={drawControl} ref={drawControl}
onDrawCreate={onDrawCreate} onDrawCreate={preview ? noop : onDrawCreate}
onDrawUpdate={onDrawUpdate} onDrawUpdate={preview ? noop : onDrawUpdate}
onDrawDelete={onDrawDelete} onDrawDelete={preview ? noop : onDrawDelete}
displayControlsDefault={false} displayControlsDefault={false}
controls={{ controls={{
point: true, point: true,
@ -202,7 +204,7 @@ const MapEditor = ({ featureCollection, url }) => {
</Map> </Map>
</> </>
); );
}; }
MapEditor.propTypes = { MapEditor.propTypes = {
featureCollection: PropTypes.shape({ featureCollection: PropTypes.shape({
@ -210,7 +212,8 @@ MapEditor.propTypes = {
features: PropTypes.array, features: PropTypes.array,
id: PropTypes.number id: PropTypes.number
}), }),
url: PropTypes.string url: PropTypes.string,
preview: PropTypes.bool
}; };
export default MapEditor; export default MapEditor;

3
app/views/shared/dossiers/editable_champs/_carte.html.haml
View file

@ -1,5 +1,6 @@
- if feature_enabled?(:new_map_editor) - if feature_enabled?(:new_map_editor)
= react_component("MapEditor", { featureCollection: champ.to_feature_collection, url: champs_carte_features_path(champ) }, class: "carte-#{champ.id}") - preview = !champ.persisted?
= react_component("MapEditor", { featureCollection: champ.to_feature_collection, url: champs_carte_features_path(preview ? 'preview' : champ), preview: preview }, class: "carte-#{champ.id}")
- else - else
.toolbar .toolbar
%button.button.primary.new-area Ajouter une zone %button.button.primary.new-area Ajouter une zone