Skip to content

Commit

Permalink
Merge branch 'object-export-ccomb' of https://github.com/MTES-MCT/eco…
Browse files Browse the repository at this point in the history
…balyse into object-export-ccomb
  • Loading branch information
paulboosz committed Nov 5, 2024
2 parents 99386dc + e6b8a2d commit d4043dc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
12 changes: 0 additions & 12 deletions src/Data/Impact.elm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module Data.Impact exposing
, applyComplements
, complementsImpactAsChartEntries
, decodeImpacts
, decodeWithoutAggregated
, default
, divideBy
, divideComplementsImpactsBy
Expand All @@ -33,15 +32,13 @@ module Data.Impact exposing
, sumImpacts
, toProtectionAreas
, totalComplementsImpactAsChartEntry
, updateAggregatedScores
, updateImpact
)

import Data.Color as Color
import Data.Impact.Definition as Definition exposing (Definition, Definitions, Trigram, Trigrams)
import Data.Unit as Unit
import Json.Decode as Decode exposing (Decoder)
import Json.Decode.Pipeline as Pipe
import Json.Encode as Encode
import Mass exposing (Mass)
import Quantity
Expand Down Expand Up @@ -414,15 +411,6 @@ decodeImpacts =
|> Decode.map Impacts


decodeWithoutAggregated : Decoder Impacts
decodeWithoutAggregated =
Definition.decodeWithoutAggregated (always Unit.decodeImpact)
-- Those aggregated impacts will have to be computed after the decoding
|> Pipe.hardcoded Quantity.zero
|> Pipe.hardcoded Quantity.zero
|> Decode.map Impacts


encode : Impacts -> Encode.Value
encode (Impacts impacts) =
impacts
Expand Down
1 change: 0 additions & 1 deletion src/Data/Impact/Definition.elm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module Data.Impact.Definition exposing
, Trigrams
, decode
, decodeBase
, decodeWithoutAggregated
, encodeBase
, filter
, foldl
Expand Down

0 comments on commit d4043dc

Please sign in to comment.